Title: [114069] trunk/Source
- Revision
- 114069
- Author
- [email protected]
- Date
- 2012-04-12 18:54:08 -0700 (Thu, 12 Apr 2012)
Log Message
Preprocessing text files with modern clang treats double slashes in comments
https://bugs.webkit.org/show_bug.cgi?id=83827
Reviewed by Mark Rowe.
Source/WebCore:
* DerivedSources.make: Pass appropriate flags to both llvm and gcc.
Source/WebKit2:
* DerivedSources.make: Pass appropriate flags to both llvm and gcc.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114068 => 114069)
--- trunk/Source/WebCore/ChangeLog 2012-04-13 01:36:22 UTC (rev 114068)
+++ trunk/Source/WebCore/ChangeLog 2012-04-13 01:54:08 UTC (rev 114069)
@@ -1,3 +1,12 @@
+2012-04-12 Alexey Proskuryakov <[email protected]>
+
+ Preprocessing text files with modern clang treats double slashes in comments
+ https://bugs.webkit.org/show_bug.cgi?id=83827
+
+ Reviewed by Mark Rowe.
+
+ * DerivedSources.make: Pass appropriate flags to both llvm and gcc.
+
2012-04-12 David Dorwin <[email protected]>
Add Encrypted Media Extensions events and errors to HTMLMediaElement
Modified: trunk/Source/WebCore/DerivedSources.make (114068 => 114069)
--- trunk/Source/WebCore/DerivedSources.make 2012-04-13 01:36:22 UTC (rev 114068)
+++ trunk/Source/WebCore/DerivedSources.make 2012-04-13 01:54:08 UTC (rev 114069)
@@ -647,6 +647,12 @@
FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
+ifeq ($(TARGET_GCC_VERSION),LLVM_COMPILER)
+ TEXT_PREPROCESSOR_FLAGS=-E -P -x c -traditional
+else
+ TEXT_PREPROCESSOR_FLAGS=-E -P -x c -std=c89
+endif
+
ifeq ($(shell $(CC) -x c++ -E -P -dM $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_DASHBOARD_SUPPORT | cut -d' ' -f3), 1)
ENABLE_DASHBOARD_SUPPORT = 1
else
@@ -663,7 +669,7 @@
DefaultFonts.plist : DefaultFonts.plist.in
@echo Pre-processing DefaultFonts.plist...
- $(CC) -E -P -w -x c -std=c89 $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" $< > $@
+ $(CC) $(TEXT_PREPROCESSOR_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" $< > $@
else
Modified: trunk/Source/WebKit2/ChangeLog (114068 => 114069)
--- trunk/Source/WebKit2/ChangeLog 2012-04-13 01:36:22 UTC (rev 114068)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-13 01:54:08 UTC (rev 114069)
@@ -1,3 +1,12 @@
+2012-04-12 Alexey Proskuryakov <[email protected]>
+
+ Preprocessing text files with modern clang treats double slashes in comments
+ https://bugs.webkit.org/show_bug.cgi?id=83827
+
+ Reviewed by Mark Rowe.
+
+ * DerivedSources.make: Pass appropriate flags to both llvm and gcc.
+
2012-04-12 Brent Fulgham <[email protected]>
[WinCairo] Build fix after Windows export definition file change.
Modified: trunk/Source/WebKit2/DerivedSources.make (114068 => 114069)
--- trunk/Source/WebKit2/DerivedSources.make 2012-04-13 01:36:22 UTC (rev 114068)
+++ trunk/Source/WebKit2/DerivedSources.make 2012-04-13 01:54:08 UTC (rev 114069)
@@ -118,6 +118,12 @@
FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
+ifeq ($(TARGET_GCC_VERSION),LLVM_COMPILER)
+ TEXT_PREPROCESSOR_FLAGS=-E -P -x c -traditional
+else
+ TEXT_PREPROCESSOR_FLAGS=-E -P -x c -std=c89
+endif
+
SANDBOX_PROFILES = \
com.apple.WebProcess.sb \
com.apple.WebKit.PluginProcess.sb
@@ -126,7 +132,7 @@
%.sb : %.sb.in
@echo Pre-processing $* sandbox profile...
- $(CC) -E -P -w -x c -std=c89 $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" $< > $@
+ $(CC) $(TEXT_PREPROCESSOR_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" $< > $@
endif # MACOS
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
