Title: [230213] trunk/Source/WebKit
Revision
230213
Author
[email protected]
Date
2018-04-03 11:14:53 -0700 (Tue, 03 Apr 2018)

Log Message

Xcode prepends line comments from WTF/Compiler.h to *.sb files
https://bugs.webkit.org/show_bug.cgi?id=184166

Reviewed by Brent Fulgham.

* DerivedSources.make:
Strip ;-comments from *.sb.in files before preprocessing so we can stop treating Platform.h/Compiler.h as C89.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (230212 => 230213)


--- trunk/Source/WebKit/ChangeLog	2018-04-03 18:14:43 UTC (rev 230212)
+++ trunk/Source/WebKit/ChangeLog	2018-04-03 18:14:53 UTC (rev 230213)
@@ -1,3 +1,13 @@
+2018-04-03  Ross Kirsling  <[email protected]>
+
+        Xcode prepends line comments from WTF/Compiler.h to *.sb files
+        https://bugs.webkit.org/show_bug.cgi?id=184166
+
+        Reviewed by Brent Fulgham.
+
+        * DerivedSources.make:
+        Strip ;-comments from *.sb.in files before preprocessing so we can stop treating Platform.h/Compiler.h as C89.
+
 2018-04-03  Chris Dumez  <[email protected]>
 
         Drop MainFrame class

Modified: trunk/Source/WebKit/DerivedSources.make (230212 => 230213)


--- trunk/Source/WebKit/DerivedSources.make	2018-04-03 18:14:43 UTC (rev 230212)
+++ trunk/Source/WebKit/DerivedSources.make	2018-04-03 18:14:53 UTC (rev 230213)
@@ -217,16 +217,8 @@
 	@echo Generating message receiver for $*...
 	@python $(WebKit2)/Scripts/generate-messages-header.py $< > $@
 
+TEXT_PREPROCESSOR_FLAGS=-E -P -w
 
-# Some versions of clang incorrectly strip out // comments in c89 code.
-# Use -traditional as a workaround, but only when needed since that causes
-# other problems with later versions of clang.
-ifeq ($(shell echo '//x' | $(CC) -E -P -x c -std=c89 - | grep x),)
-TEXT_PREPROCESSOR_FLAGS=-E -P -x c -traditional -w
-else
-TEXT_PREPROCESSOR_FLAGS=-E -P -x c -std=c89 -w
-endif
-
 ifneq ($(SDKROOT),)
 	SDK_FLAGS=-isysroot $(SDKROOT)
 endif
@@ -245,7 +237,7 @@
 
 %.sb : %.sb.in
 	@echo Pre-processing $* sandbox profile...
-	$(CC) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(TEXT_PREPROCESSOR_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" $< > $@
+	grep -o '^[^;]*' $< | $(CC) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(TEXT_PREPROCESSOR_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" - > $@
 
 AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS = \
 	$(_javascript_Core_SCRIPTS_DIR)/cpp_generator_templates.py \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to