summaryrefslogtreecommitdiffstats
path: root/core/combo/TARGET_linux-x86.mk
diff options
context:
space:
mode:
authorPavel Chupin <pavel.v.chupin@intel.com>2013-08-23 16:49:21 +0400
committerPavel Chupin <pavel.v.chupin@intel.com>2013-08-26 10:42:42 +0400
commitc1a5664ea3882800dfc538a9591828f9c429f6d7 (patch)
tree8842f2193bb1b3ec9369ac856b495f50d8cca9d0 /core/combo/TARGET_linux-x86.mk
parent929b3a24b0c1b1ff2488ef08f05040c63aeaa9ed (diff)
downloadbuild-c1a5664ea3882800dfc538a9591828f9c429f6d7.zip
build-c1a5664ea3882800dfc538a9591828f9c429f6d7.tar.gz
build-c1a5664ea3882800dfc538a9591828f9c429f6d7.tar.bz2
Switch x86 default compiler to multilib version
Switch from gcc-4.7 32-bit only to gcc-4.7 multilib (32/x32/64) compiler. Tested x86 image build on Linux and Darwin. This bionic patch is required: https://android-review.googlesource.com/#/c/64183 Change-Id: Ifc2c6c5d6a4a1b71a00a87af072bb7f67b1c284d Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
-rw-r--r--core/combo/TARGET_linux-x86.mk4
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)