i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix my previous commit

Browse Source 
I didn't realize that if $(var) is true if var is 0. Only noticed that
after pushing, sorry.
This commit is contained in:
Jonathan Schleifer
2014-04-03 18:52:17 +02:00
parent c2b76f7f8f
commit ecf79f7430
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+4 -4
View File
@@ -29,7 +29,7 @@ rule ArchitectureSetup architecture
# http://www.freelists.org/post/haiku-development/hrev45320-Yet-another-nonobvious-effect-of-ftreevrp-optimization # http://www.freelists.org/post/haiku-development/hrev45320-Yet-another-nonobvious-effect-of-ftreevrp-optimization
if $(gccVersion[1]) >= 3 { if $(gccVersion[1]) >= 3 {
gccBaseFlags += -fno-strict-aliasing ; gccBaseFlags += -fno-strict-aliasing ;
if ! $(HAIKU_CC_IS_CLANG_$(architecture)) { if $(HAIKU_CC_IS_CLANG_$(architecture)) = 0 {
gccBaseFlags += -fno-tree-vrp ; gccBaseFlags += -fno-tree-vrp ;
} }
} }
@@ -393,7 +393,7 @@ rule KernelArchitectureSetup architecture
local g++BaseFlags = $(gccBaseFlags) -fno-exceptions ; local g++BaseFlags = $(gccBaseFlags) -fno-exceptions ;
if $(gccVersion[1]) >= 3 && ! $(HAIKU_CC_IS_CLANG_$(architecture)) { if $(gccVersion[1]) >= 3 && $(HAIKU_CC_IS_CLANG_$(architecture)) = 0 {
g++BaseFlags += -fno-use-cxa-atexit ; g++BaseFlags += -fno-use-cxa-atexit ;
} }
@@ -498,7 +498,7 @@ rule ArchitectureSetupWarnings architecture
rule EnableWerror dirTokens : scope { rule EnableWerror dirTokens : scope {
# Clang gives way more warnings than GCC, so that code won't compile # Clang gives way more warnings than GCC, so that code won't compile
# -Werror when using Clang. # -Werror when using Clang.
if ! $(HAIKU_CC_IS_CLANG_$(architecture)) { if $(HAIKU_CC_IS_CLANG_$(architecture)) = 0 {
SetConfigVar WARNINGS : HAIKU_TOP $(dirTokens) : treatAsErrors SetConfigVar WARNINGS : HAIKU_TOP $(dirTokens) : treatAsErrors
: $(scope) ; : $(scope) ;
} }
@@ -513,7 +513,7 @@ rule ArchitectureSetupWarnings architecture
WARNINGS on $(file) = $(WARNINGS) ; WARNINGS on $(file) = $(WARNINGS) ;
} }
if $(HAIKU_CC_IS_CLANG_$(architecture)) { if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
# We need -integrated-as, as otherwise Clang uses GCC as assembler and # We need -integrated-as, as otherwise Clang uses GCC as assembler and
# passes -fheinous-gnu-extensions to GCC, which GCC does not understand # passes -fheinous-gnu-extensions to GCC, which GCC does not understand
# then errors out. # then errors out.