Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BuildSetup wasn't caring about HAIKU_CCFLAGS or HAIKU_C++FLAGS set at configuring time.

Browse Source 
A bit out of my comfortzone with, so please tell me if I'm wrong.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42949 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Holmqvist 2011-10-29 13:40:53 +00:00
parent cd32d81c40
commit eab1b0e87e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/jam/BuildSetup
View File

@ -164,10 +164,14 @@ HAIKU_LINK = $(HAIKU_CC) ;
HAIKU_LINKFLAGS = $(HAIKU_GCC_BASE_FLAGS) ;
HAIKU_HDRS = [ FStandardHeaders ] ;
HAIKU_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) -nostdinc ;
HAIKU_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) -nostdinc ;
HAIKU_KERNEL_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) ;
HAIKU_KERNEL_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) ;
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_DEFINES = __HAIKU__ ;
HAIKU_NO_WERROR ?= 0 ;
@ -361,10 +365,15 @@ switch $(HAIKU_ARCH) {
}
case x86 :
{
HAIKU_CCFLAGS += -march=pentium ;
HAIKU_C++FLAGS += -march=pentium ;
HAIKU_KERNEL_CCFLAGS += -march=pentium ;
HAIKU_KERNEL_C++FLAGS += -march=pentium ;
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 ;
}
# Enable use of the gcc built-in atomic functions instead of atomic_*().
# The former are inlined and have thus less overhead. They are not