From 2d980c7f9da5fd36809c981507e3c62245100460 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Thu, 3 Nov 2011 20:54:21 +0000 Subject: [PATCH] Reworked the way HAIKU_CCFLAGS, HAIKU_C++FLAGS and their kernel equivalents are set. The flags given to configure are kept and the build just adds its own flags onto these. Also the kernel flags are also based on the flags given at configure. I suspect this will be needed for llvm. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43169 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index b0bd5dc593..737bd1397f 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -164,14 +164,10 @@ HAIKU_LINK = $(HAIKU_CC) ; HAIKU_LINKFLAGS = $(HAIKU_GCC_BASE_FLAGS) ; HAIKU_HDRS = [ FStandardHeaders ] ; - -HAIKU_CUSTOM_CCFLAGS = $(HAIKU_CCFLAGS) ; -HAIKU_CUSTOM_C++FLAGS = $(HAIKU_C++FLAGS) ; - -HAIKU_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_CCFLAGS) -nostdinc ; -HAIKU_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_C++FLAGS) -nostdinc ; -HAIKU_KERNEL_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_CCFLAGS) ; -HAIKU_KERNEL_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_C++FLAGS) ; +HAIKU_KERNEL_CCFLAGS = $(HAIKU_CCFLAGS) $(HAIKU_GCC_BASE_FLAGS) ; +HAIKU_KERNEL_C++FLAGS = $(HAIKU_C++FLAGS) $(HAIKU_GCC_BASE_FLAGS) ; +HAIKU_CCFLAGS += $(HAIKU_GCC_BASE_FLAGS) -nostdinc ; +HAIKU_C++FLAGS += $(HAIKU_GCC_BASE_FLAGS) -nostdinc ; HAIKU_DEFINES = __HAIKU__ ; HAIKU_NO_WERROR ?= 0 ; @@ -365,15 +361,10 @@ switch $(HAIKU_ARCH) { } case x86 : { - if $(HAIKU_CUSTOM_CCFLAGS) = '' { - HAIKU_CCFLAGS += -march=pentium ; - HAIKU_KERNEL_CCFLAGS += -march=pentium ; - } - - if $(HAIKU_CUSTOM_C++FLAGS) = '' { - HAIKU_C++FLAGS += -march=pentium ; - HAIKU_KERNEL_C++FLAGS += -march=pentium ; - } + HAIKU_CCFLAGS += -march=pentium ; + HAIKU_C++FLAGS += -march=pentium ; + HAIKU_KERNEL_CCFLAGS += -march=pentium ; + HAIKU_KERNEL_C++FLAGS += -march=pentium ; # Enable use of the gcc built-in atomic functions instead of atomic_*(). # The former are inlined and have thus less overhead. They are not