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

Merge "Define TARGET_GCC_VERSION in target specific make files."

Browse Source
This commit is contained in:
Ben Cheng
2012-12-11 15:52:02 -08:00
committed by Gerrit Code Review
parent a303510f13 054ffd2e7c
commit 62f1d86e48
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := armv5te TARGET_ARCH_VARIANT := armv5te
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION)),)
TARGET_GCC_VERSION := 4.6
endif
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk
ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))

4
core/combo/TARGET_linux-mips.mk
View File

@@ -34,6 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := mips32r2-fp TARGET_ARCH_VARIANT := mips32r2-fp
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION)),)
TARGET_GCC_VERSION := 4.6
endif
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk
ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT)) $(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT))

4
core/combo/TARGET_linux-x86.mk
View File

@@ -22,6 +22,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
endif endif
ifeq ($(strip $(TARGET_GCC_VERSION)),)
TARGET_GCC_VERSION := 4.6
endif
# Include the arch-variant-specific configuration file. # Include the arch-variant-specific configuration file.
# Its role is to define various ARCH_X86_HAVE_XXX feature macros, # Its role is to define various ARCH_X86_HAVE_XXX feature macros,
# plus initial values for TARGET_GLOBAL_CFLAGS # plus initial values for TARGET_GLOBAL_CFLAGS

5
core/config.mk
View File

@@ -225,11 +225,6 @@ ifeq ($(TARGET_CPU_ABI),)
endif endif
TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2)) TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2))
# default target GCC version
ifeq ($(strip $(TARGET_GCC_VERSION)),)
TARGET_GCC_VERSION := 4.6
endif
# $(1): os/arch # $(1): os/arch
define select-android-config-h define select-android-config-h
build/core/combo/include/arch/$(1)/AndroidConfig.h build/core/combo/include/arch/$(1)/AndroidConfig.h

4
envsetup.sh
View File

@@ -124,11 +124,11 @@ function setpaths()
export ANDROID_EABI_TOOLCHAIN= export ANDROID_EABI_TOOLCHAIN=
local ARCH=$(get_build_var TARGET_ARCH) local ARCH=$(get_build_var TARGET_ARCH)
case $ARCH in case $ARCH in
x86) toolchaindir=x86/i686-linux-android-4.6/bin x86) toolchaindir=x86/i686-linux-android-$targetgccversion/bin
;; ;;
arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin
;; ;;
mips) toolchaindir=mips/mipsel-linux-android-4.6/bin mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin
;; ;;
*) *)
echo "Can't find toolchain for unknown architecture: $ARCH" echo "Can't find toolchain for unknown architecture: $ARCH"