From e823d3f06fc3f999a09951442c5120874ed34a9b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 11 Aug 2018 15:33:08 -0400 Subject: [PATCH] BeOSRules: Pass CCFLAGS through to the compiler during ResComp. 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. --- build/jam/BeOSRules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules index 17d3715fb7..b12bafa6b9 100644 --- a/build/jam/BeOSRules +++ b/build/jam/BeOSRules @@ -222,6 +222,7 @@ rule ResComp # get compiler and defines for the platform local cc ; local defines ; + local flags ; local localIncludesOption ; on $(1) { # use on $(1) variable values @@ -230,11 +231,13 @@ rule ResComp if $(PLATFORM) = host { defines += $(HOST_DEFINES) ; cc = $(HOST_CC) ; + flags += $(HOST_CCFLAGS) ; localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ; } else { defines += $(TARGET_DEFINES_$(TARGET_PACKAGING_ARCH)) $(TARGET_DEFINES) ; cc = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ; + flags += $(TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH)) ; localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ; } @@ -242,6 +245,7 @@ rule ResComp DEFINES on $(1) = $(defines) ; CCDEFS on $(1) = [ FDefines $(defines) ] ; + CCFLAGS on $(1) = $(flags) ; HDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) : $(localIncludesOption) ] ; RCHDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) @@ -261,7 +265,8 @@ rule ResComp actions ResComp1 { $(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