diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 12:06:01 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 12:06:01 +0800 |
| commit | 06b63baedc769863f87ac0b789ac320b3cb0dc2a (patch) | |
| tree | 6f51c4a6b9bf6e4ffb724e3f4440c693bc33aff3 /core/dumpvar.mk | |
| parent | d883749e600a34b5eb4db542d24946b25aa5c9fb (diff) | |
| download | build-06b63baedc769863f87ac0b789ac320b3cb0dc2a.zip build-06b63baedc769863f87ac0b789ac320b3cb0dc2a.tar.gz build-06b63baedc769863f87ac0b789ac320b3cb0dc2a.tar.bz2 | |
Add TARGET_GCC_VERSION
Default to 4.6, but can overwritten to something else in
prebuilts/gcc/$os/$arch/$arch-linux-android*-$ver
Change-Id: I16f99d642b8ff8e831d392261a0c536041107051
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 5298f35..c47aa0f 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -11,23 +11,23 @@ endif # Add the ARM toolchain bin dir if it actually exists ifeq ($(TARGET_ARCH),arm) - ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin),) + ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin endif 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-4.6/bin),) + ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-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-4.6/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin endif endif # Add the mips toolchain bin dir if it actually exists -ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6/bin),) +ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)/bin endif ANDROID_BUILD_PATHS := $(ABP) |