Title: [128527] trunk/Source
- Revision
- 128527
- Author
- [email protected]
- Date
- 2012-09-13 16:48:50 -0700 (Thu, 13 Sep 2012)
Log Message
<rdar://problem/12283706> WebKit looks for some files on the system even when building against an SDK.
Reviewed by David Kilzer.
If an SDK is being used, pass it through to our custom invocations of the preprocessor.
Source/WebCore:
* DerivedSources.make:
Source/WebKit2:
* DerivedSources.make:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128526 => 128527)
--- trunk/Source/WebCore/ChangeLog 2012-09-13 23:29:55 UTC (rev 128526)
+++ trunk/Source/WebCore/ChangeLog 2012-09-13 23:48:50 UTC (rev 128527)
@@ -1,3 +1,13 @@
+2012-09-13 Mark Rowe <[email protected]>
+
+ <rdar://problem/12283706> WebKit looks for some files on the system even when building against an SDK.
+
+ Reviewed by David Kilzer.
+
+ If an SDK is being used, pass it through to our custom invocations of the preprocessor.
+
+ * DerivedSources.make:
+
2012-09-13 Tom Sepez <[email protected]>
ASSERT(!eventDispatchForbidden()) fires when removed plugin re-inserted as part of readyStateChange.
Modified: trunk/Source/WebCore/DerivedSources.make (128526 => 128527)
--- trunk/Source/WebCore/DerivedSources.make 2012-09-13 23:29:55 UTC (rev 128526)
+++ trunk/Source/WebCore/DerivedSources.make 2012-09-13 23:48:50 UTC (rev 128527)
@@ -675,13 +675,17 @@
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)
+ifneq ($(SDKROOT),)
+ SDK_FLAGS=-isysroot $(SDKROOT)
+endif
+
+ifeq ($(shell $(CC) -x c++ -E -P -dM $(SDK_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_DASHBOARD_SUPPORT | cut -d' ' -f3), 1)
ENABLE_DASHBOARD_SUPPORT = 1
else
ENABLE_DASHBOARD_SUPPORT = 0
endif
-ifeq ($(shell $(CC) -x c++ -E -P -dM $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -x c++ -E -P -dM $(SDK_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
ENABLE_ORIENTATION_EVENTS = 1
else
ENABLE_ORIENTATION_EVENTS = 0
Modified: trunk/Source/WebKit2/ChangeLog (128526 => 128527)
--- trunk/Source/WebKit2/ChangeLog 2012-09-13 23:29:55 UTC (rev 128526)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-13 23:48:50 UTC (rev 128527)
@@ -1,3 +1,13 @@
+2012-09-13 Mark Rowe <[email protected]>
+
+ <rdar://problem/12283706> WebKit looks for some files on the system even when building against an SDK.
+
+ Reviewed by David Kilzer.
+
+ If an SDK is being used, pass it through to our custom invocations of the preprocessor.
+
+ * DerivedSources.make:
+
2012-09-13 Brent Fulgham <[email protected]>
[WinCairo] Unreviewed build fix for export declarations.
Modified: trunk/Source/WebKit2/DerivedSources.make (128526 => 128527)
--- trunk/Source/WebKit2/DerivedSources.make 2012-09-13 23:29:55 UTC (rev 128526)
+++ trunk/Source/WebKit2/DerivedSources.make 2012-09-13 23:48:50 UTC (rev 128527)
@@ -124,6 +124,10 @@
TEXT_PREPROCESSOR_FLAGS=-E -P -x c -std=c89
endif
+ifneq ($(SDKROOT),)
+ SDK_FLAGS=-isysroot $(SDKROOT)
+endif
+
SANDBOX_PROFILES = \
com.apple.WebProcess.sb \
com.apple.WebKit.PluginProcess.sb
@@ -132,7 +136,7 @@
%.sb : %.sb.in
@echo Pre-processing $* sandbox profile...
- $(CC) $(TEXT_PREPROCESSOR_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" $< > $@
+ $(CC) $(SDK_FLAGS) $(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/webkit-changes
