Title: [211694] branches/safari-603-branch/Tools
- Revision
- 211694
- Author
- matthew_han...@apple.com
- Date
- 2017-02-05 20:03:36 -0800 (Sun, 05 Feb 2017)
Log Message
Merge r211526. rdar://problem/30301498
Modified Paths
Diff
Modified: branches/safari-603-branch/Tools/ChangeLog (211693 => 211694)
--- branches/safari-603-branch/Tools/ChangeLog 2017-02-06 04:03:34 UTC (rev 211693)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-06 04:03:36 UTC (rev 211694)
@@ -1,3 +1,22 @@
+2017-02-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r211526. rdar://problem/30301498
+
+ 2017-02-01 Alexey Proskuryakov <a...@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 Matthew Hanson <matthew_han...@apple.com>
Merge r211502. rdar://problem/30298722
Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/Base.xcconfig (211693 => 211694)
--- branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2017-02-06 04:03:34 UTC (rev 211693)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2017-02-06 04:03:36 UTC (rev 211694)
@@ -32,8 +32,6 @@
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=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);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
