StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22."

Browse Source
This commit is contained in:
Ben Cheng
2012-12-12 09:33:13 -08:00
committed by Gerrit Code Review
parent 62f1d86e48 5011dd80ee
commit 98ce73b27a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CleanSpec.mk
View File

@@ -150,6 +150,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
# For GCC 4.7 toolchain change
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

2
core/combo/TARGET_linux-arm.mk
View File

@@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := armv5te
endif
ifeq ($(strip $(TARGET_GCC_VERSION)),)
TARGET_GCC_VERSION := 4.6
TARGET_GCC_VERSION := 4.7
endif
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

2
envsetup.sh
View File

@@ -116,7 +116,7 @@ function setpaths()
prebuiltdir=$(getprebuilt)
gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)
# defined in core/config.mk
# defined in core/combo/TARGET_linux-{arm,mips,x86}.mk
targetgccversion=$(get_build_var TARGET_GCC_VERSION)
export TARGET_GCC_VERSION=$targetgccversion