Always include System.framework in WebKitLegacy's CPLUSPLUSFLAGS
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Mar 2020 21:41:31 +0000 (21:41 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Mar 2020 21:41:31 +0000 (21:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=209147

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:
* Configurations/WebKitLegacy.xcconfig:
Bring WebKitLegacy's xcconfigs in line with all the other projects,
adding System.framework globally, and in Base.xcconfig.

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

Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/Base.xcconfig
Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

index 49df5cf..efbc548 100644 (file)
@@ -1,3 +1,15 @@
+2020-03-16  Timothy Horton  <timothy_horton@apple.com>
+
+        Always include System.framework in WebKitLegacy's CPLUSPLUSFLAGS
+        https://bugs.webkit.org/show_bug.cgi?id=209147
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/WebKitLegacy.xcconfig:
+        Bring WebKitLegacy's xcconfigs in line with all the other projects,
+        adding System.framework globally, and in Base.xcconfig.
+
 2020-03-16  Simon Fraser  <simon.fraser@apple.com>
 
         Remove FrameView::scheduleRenderingUpdate()
index da8be9f..96def88 100644 (file)
@@ -123,7 +123,7 @@ SDKROOT = macosx.internal;
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
 
 WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
index b90687f..6e9b9cd 100644 (file)
@@ -45,7 +45,6 @@ SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Pri
 
 OTHER_CFLAGS = $(inherited) $(OTHER_CFLAGS_COCOA_TOUCH);
 OTHER_CFLAGS_COCOA_TOUCH = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-OTHER_CFLAGS_COCOA_TOUCH_YES = -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
 OTHER_CFLAGS_COCOA_TOUCH_NO = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
 OTHER_CPLUSPLUSFLAGS = $(inherited) $(OTHER_CFLAGS_COCOA_TOUCH);