diff options
| author | Ying Wang <wangying@android.com> | 2013-09-14 13:47:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-14 13:47:03 -0700 |
| commit | fad629f4dd07720b427c6a219ad93886e23ca277 (patch) | |
| tree | f11fe161dd040ab703703a0d4b61ce815ea82075 /core/combo | |
| parent | 65d5e7886565ebf094e87dcf3d2c9ffa80afca4f (diff) | |
| parent | 7f2ad751aebf9d13d63f20a451c28d4a41c4569a (diff) | |
| download | build-fad629f4dd07720b427c6a219ad93886e23ca277.zip build-fad629f4dd07720b427c6a219ad93886e23ca277.tar.gz build-fad629f4dd07720b427c6a219ad93886e23ca277.tar.bz2 | |
am 7f2ad751: Merge "Switch x86 default compiler to multilib version"
* commit '7f2ad751aebf9d13d63f20a451c28d4a41c4569a':
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 159fbe1..7506787 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) |