Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e009f295 authored by Andy McFadden's avatar Andy McFadden
Browse files

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.
parent b94202f2

core/combo/linux-arm.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

core/combo/linux-x86.mk

+2 −0
Original line number Diff line number Diff line
@@ -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