[Mac] TestWebKitAPI includes system frameworks incorrectly
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Feb 2017 22:02:04 +0000 (22:02 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Feb 2017 22:02:04 +0000 (22:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167703
rdar://problem/30301498

Reviewed by Ryosuke Niwa.

FRAMEWORK_SEARCH_PATH results in frameworks being treated as user ones, not system.
Make TestWebKitAPI use -iframework instead, like the rest of WebKit does.

Also, reduced the number of subframework search paths, looks like we only need one now.

* TestWebKitAPI/Configurations/Base.xcconfig:

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

Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/Base.xcconfig

index a787572..86e8b82 100644 (file)
@@ -1,3 +1,18 @@
+2017-02-01  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] TestWebKitAPI includes system frameworks incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=167703
+        rdar://problem/30301498
+
+        Reviewed by Ryosuke Niwa.
+
+        FRAMEWORK_SEARCH_PATH results in frameworks being treated as user ones, not system.
+        Make TestWebKitAPI use -iframework instead, like the rest of WebKit does.
+
+        Also, reduced the number of subframework search paths, looks like we only need one now.
+
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+
 2017-02-01  Brent Fulgham  <bfulgham@apple.com>
 
         Correct "filesHaveSameVolume" predicate
index 6e1f044..7a089d2 100644 (file)
@@ -32,8 +32,6 @@ CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
 HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport;
-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
-FRAMEWORK_SEARCH_PATHS_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
 
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
@@ -94,5 +92,6 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm;
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *Mac.h *Mac.cpp *Mac.mm */mac/*;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);