From 106d4015f20b51d3cc036588e8927d1a6bea56f8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 28 Aug 2013 00:46:12 +0200 Subject: [PATCH] rule ArchitectureSetup: Remove superfluous arch macro definition The macro for the architecture is already defined by the compiler. --- build/jam/ArchitectureRules | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index c71f56e0b7..1181446fc7 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -62,35 +62,12 @@ rule ArchitectureSetup architecture HAIKU_CCFLAGS_$(architecture) += $(gccBaseFlags) -nostdinc ; HAIKU_C++FLAGS_$(architecture) += $(gccBaseFlags) -nostdinc ; - local cpu = $(HAIKU_CPU_$(architecture)) ; - switch $(cpu) { - case ppc : - HAIKU_DEFINES_$(architecture) += __POWERPC__ ; - - case arm : - HAIKU_DEFINES_$(architecture) += __ARM__ ; - - case x86 : - HAIKU_DEFINES_$(architecture) += __INTEL__ ; - - case x86_64 : - HAIKU_DEFINES_$(architecture) += __x86_64__ ; - - case m68k : - HAIKU_DEFINES_$(architecture) += __M68K__ ; - - case mipsel : - HAIKU_DEFINES_$(architecture) += __MIPSEL__ ; - - case * : - Exit "Currently unsupported target CPU:" $(cpu) ; - } - # strip is required if ! $(HAIKU_STRIP_$(architecture)) { Exit "HAIKU_STRIP_$(architecture) not set. Please re-run configure." ; } + local cpu = $(HAIKU_CPU_$(architecture)) ; HAIKU_ARCH_$(architecture) = $(cpu) ; HAIKU_ARCH ?= $(cpu) ; # Set only, if not set yet. This way HAIKU_ARCH is set to the primary