<rdar://problem/12283706> WebKit looks for some files on the system even when buildin...
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Sep 2012 23:48:50 +0000 (23:48 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Sep 2012 23:48:50 +0000 (23:48 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.make

index 3152c97..35d41b3 100644 (file)
@@ -1,3 +1,13 @@
+2012-09-13  Mark Rowe  <mrowe@apple.com>
+
+        <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  <tsepez@chromium.org>
 
         ASSERT(!eventDispatchForbidden()) fires when removed plugin re-inserted as part of readyStateChange.
index b9d63be..d1f0972 100644 (file)
@@ -675,13 +675,17 @@ 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)
+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
index 6f4dbd5..a6641d2 100644 (file)
@@ -1,3 +1,13 @@
+2012-09-13  Mark Rowe  <mrowe@apple.com>
+
+        <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  <bfulgham@webkit.org>
 
         [WinCairo] Unreviewed build fix for export declarations.
index f1f5c2c..496c730 100644 (file)
@@ -124,6 +124,10 @@ else
        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 @@ all: $(SANDBOX_PROFILES)
 
 %.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