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

BeOSRules: Pass CCFLAGS through to the compiler during ResComp.

Browse Source 
Otherwise, Clang warns that we haven't set an architecture on ARM,
which is set in CCFLAGS. Since these might also contain other flags
that affect the preprocessor, there isn't any good reason to not
pass it through, so do that.
This commit is contained in:
Augustin Cavalier
2018-08-11 15:33:08 -04:00
parent d0bfb2c044
commit e823d3f06f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BeOSRules
+6 -1
View File
@@ -222,6 +222,7 @@ rule ResComp
# get compiler and defines for the platform # get compiler and defines for the platform
local cc ; local cc ;
local defines ; local defines ;
local flags ;
local localIncludesOption ; local localIncludesOption ;
on $(1) { # use on $(1) variable values on $(1) { # use on $(1) variable values
@@ -230,11 +231,13 @@ rule ResComp
if $(PLATFORM) = host { if $(PLATFORM) = host {
defines += $(HOST_DEFINES) ; defines += $(HOST_DEFINES) ;
cc = $(HOST_CC) ; cc = $(HOST_CC) ;
flags += $(HOST_CCFLAGS) ;
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ; localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
} else { } else {
defines += $(TARGET_DEFINES_$(TARGET_PACKAGING_ARCH)) defines += $(TARGET_DEFINES_$(TARGET_PACKAGING_ARCH))
$(TARGET_DEFINES) ; $(TARGET_DEFINES) ;
cc = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ; cc = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ;
flags += $(TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH)) ;
localIncludesOption localIncludesOption
= $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ; = $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
} }
@@ -242,6 +245,7 @@ rule ResComp
DEFINES on $(1) = $(defines) ; DEFINES on $(1) = $(defines) ;
CCDEFS on $(1) = [ FDefines $(defines) ] ; CCDEFS on $(1) = [ FDefines $(defines) ] ;
CCFLAGS on $(1) = $(flags) ;
HDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) HDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS)
: $(localIncludesOption) ] ; : $(localIncludesOption) ] ;
RCHDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) RCHDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS)
@@ -261,7 +265,8 @@ rule ResComp
actions ResComp1 actions ResComp1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - | egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" - cat "$(2[2-])" | $(CC) $(CCFLAGS) -E $(CCDEFS) $(HDRS) - \
| egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" -
} }
rule ResAttr attributeFile : _resourceFiles : deleteAttributeFile rule ResAttr attributeFile : _resourceFiles : deleteAttributeFile