openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix build. 

The "set default variant to armv5te if none defined" in the ARM config
was applying to all architectures, but as it turns out only ARM builds
actually cared.  When I made a copy of the "set default" code to the x86
config, one or the other would win for builds that didn't specify a
variant.  Turns out x86 won, so sim and voles worked, but opal didn't.
This commit is contained in:
Andy McFadden 2010-02-23 10:24:33 -08:00
parent b94202f222
commit e009f29590
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,9 +14,11 @@
# include defines, and compiler settings for the given architecture
# version.
#
ifeq ($(TARGET_ARCH),arm)
ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := armv5te
endif
endif
# TARGET_ARCH_VARIANT used to be called TARGET_ARCH_VERSION
# to avoid any weirdness, issue an error message if the latter

2
core/combo/linux-x86.mk
View File

@ -2,9 +2,11 @@
# Included by combo/select.make
# Provide a default variant.
ifeq ($(TARGET_ARCH),x86)
ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := x86
endif
endif
# right now we get these from the environment, but we should
# pick them from the tree somewhere