diff options
| author | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-08-23 16:49:21 +0400 |
|---|---|---|
| committer | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-08-26 10:42:42 +0400 |
| commit | c1a5664ea3882800dfc538a9591828f9c429f6d7 (patch) | |
| tree | 8842f2193bb1b3ec9369ac856b495f50d8cca9d0 /core/dumpvar.mk | |
| parent | 929b3a24b0c1b1ff2488ef08f05040c63aeaa9ed (diff) | |
| download | build-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/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 92bf6af..2612e06 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -22,9 +22,9 @@ ifeq ($(TARGET_ARCH),arm) else ifeq ($(TARGET_ARCH),x86) # Add the x86 toolchain bin dir if it actually exists - ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin),) + ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)/bin endif endif |