diff options
| author | Ying Wang <wangying@android.com> | 2013-09-14 13:49:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-14 13:49:15 -0700 |
| commit | c5c32d8f4a202f19a967678c283e71b75d1061c8 (patch) | |
| tree | 5f67b9b20d7cff5e9e8ef43aaa446e3fae2edda5 /core/combo | |
| parent | 5a6e47bffb8d0bfec2f9adcfd11cac5545db596a (diff) | |
| parent | fad629f4dd07720b427c6a219ad93886e23ca277 (diff) | |
| download | build-c5c32d8f4a202f19a967678c283e71b75d1061c8.zip build-c5c32d8f4a202f19a967678c283e71b75d1061c8.tar.gz build-c5c32d8f4a202f19a967678c283e71b75d1061c8.tar.bz2 | |
am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib version"
* commit 'fad629f4dd07720b427c6a219ad93886e23ca277':
Switch x86 default compiler to multilib version
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 4e13797..2fb45d9 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -42,8 +42,8 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) -TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION) -TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-linux-android- +TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION) +TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/x86_64-linux-android- endif TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) |