diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 19:55:06 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 19:55:06 +0100 |
| commit | dd96a6f2073354c2823517b21f10685332cfc08c (patch) | |
| tree | bf733a9c76a28c3a7b039835096035b37d430909 | |
| parent | b37e87a3829decbb129c01efee8685f8d2ef2c15 (diff) | |
| download | build-dd96a6f2073354c2823517b21f10685332cfc08c.zip build-dd96a6f2073354c2823517b21f10685332cfc08c.tar.gz build-dd96a6f2073354c2823517b21f10685332cfc08c.tar.bz2 | |
fix gcc tools path
export androideabi arm toolchain path
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 6 | ||||
| -rw-r--r-- | core/combo/HOST_linux-x86_64.mk | 6 | ||||
| -rw-r--r-- | envsetup.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 0e3511c..92219b6 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -20,9 +20,9 @@ ifeq ($(strip $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)),) $(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8/bin/x86_64-linux- endif -$(combo_2nd_arch_prefix)HOST_CC := toolchain/gcc/host/install/bin/gcc -$(combo_2nd_arch_prefix)HOST_CXX := toolchain/gcc/host/install/bin/g++ -$(combo_2nd_arch_prefix)HOST_AR := toolchain/gcc/host/install/bin/ar +$(combo_2nd_arch_prefix)HOST_CC := toolchain/gcc/host/install/bin/x86_64-linux-gcc +$(combo_2nd_arch_prefix)HOST_CXX := toolchain/gcc/host/install/bin/x86_64-linux-g++ +$(combo_2nd_arch_prefix)HOST_AR := toolchain/gcc/host/install/bin/x86_64-linux-ar # gcc location for clang; to be updated when clang is updated $(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8/ diff --git a/core/combo/HOST_linux-x86_64.mk b/core/combo/HOST_linux-x86_64.mk index 3b5b59a..0f9e37b 100644 --- a/core/combo/HOST_linux-x86_64.mk +++ b/core/combo/HOST_linux-x86_64.mk @@ -20,9 +20,9 @@ ifeq ($(strip $(HOST_TOOLCHAIN_PREFIX)),) HOST_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8/bin/x86_64-linux- endif -HOST_CC := toolchain/gcc/host/install/bin/gcc -HOST_CXX := toolchain/gcc/host/install/bin/g++ -HOST_AR := toolchain/gcc/host/install/bin/ar +HOST_CC := toolchain/gcc/host/install/bin/x86_64-linux-gcc +HOST_CXX := toolchain/gcc/host/install/bin/x86_64-linux-g++ +HOST_AR := toolchain/gcc/host/install/bin/x86_64-linux-ar # gcc location for clang; to be updated when clang is updated HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8/ diff --git a/envsetup.sh b/envsetup.sh index 8a97863..517573f 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -169,7 +169,7 @@ function setpaths() ;; x86_64) toolchaindir=x86/x86_64-linux-android-$targetgccversion/bin ;; - arm) export ANDROID_TOOLCHAIN=toolchain/gcc/arm-linux-androideabi/install/bin/arm-linux-androideabi- + arm) export TARGET_TOOLS_PREFIX=toolchain/gcc/arm/arm-linux-androideabi/install/bin/arm-linux-androideabi- ;; arm64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin; toolchaindir2=arm/arm-linux-androideabi-$targetgccversion2/bin |