[haiku-commits] haiku: hrev49773 - build/jam

  • From: js-haiku-commits@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 8 Nov 2015 00:37:56 +0100 (CET)

hrev49773 adds 1 changeset to branch 'master'
old head: 74068663408da669701309728e1ab8ce6b0aead2
new head: f10b49ed414c698ce4637231073fc76cba141398
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=f10b49ed414c+%5E74068663408d

----------------------------------------------------------------------------

f10b49ed414c: Fixup for my last commit (better check for Clang)

[ Jonathan Schleifer <js@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision: hrev49773
Commit: f10b49ed414c698ce4637231073fc76cba141398
URL: http://cgit.haiku-os.org/haiku/commit/?id=f10b49ed414c
Author: Jonathan Schleifer <js@xxxxxxxxxxx>
Date: Sat Nov 7 23:37:13 2015 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 4 deletions(-)
build/jam/MainBuildRules | 8 ++++----

----------------------------------------------------------------------------

diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 75f35c9..0e526a1 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -353,6 +353,10 @@ rule CreateAsmStructOffsetsHeader header : source
flags += -Wno-invalid-offsetof ;
# TODO: Rather get rid of the respective offsetof() instances.

+ if $(HAIKU_CC_IS_CLANG_$(TARGET_PACKAGING_ARCH)) = 1 {
+ flags += -no-integrated-as ;
+ }
+
# locate object, search for source, and set on target variables

Depends $(header) : $(source) $(PLATFORM) ;
@@ -371,10 +375,6 @@ rule CreateAsmStructOffsetsHeader header : source
[ FSysIncludes $(sysHeaders) : $(systemIncludesOption) ] ;
CCDEFS on $(header) = [ FDefines $(defines) ] ;

- if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
- C++FLAGS on $(header) += -no-integrated-as ;
- }
-
CreateAsmStructOffsetsHeader1 $(header) : $(source) ;
}



Other related posts:

  • » [haiku-commits] haiku: hrev49773 - build/jam - js-haiku-commits