Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (259465 => 259466)
--- trunk/Source/_javascript_Core/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,16 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/ToolExecutable.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-03 Yusuke Suzuki <[email protected]>
Unreviewed, partially reverting Structure change due to Speedometer2 regression
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -151,9 +151,7 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (259465 => 259466)
--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -54,8 +54,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -isystem icu;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+OTHER_CFLAGS = $(inherited) -isystem icu;
// Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" "${BUILT_PRODUCTS_DIR}/LLIntOffsets/${ARCHS}" "$(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders" $(inherited);
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (259465 => 259466)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-04-03 16:51:30 UTC (rev 259466)
@@ -3399,7 +3399,6 @@
third_party/base,
src/common/third_party/base,
);
- OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
};
name = Production;
};
@@ -3428,7 +3427,6 @@
third_party/base,
src/common/third_party/base,
);
- OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
};
name = Debug;
};
@@ -3442,7 +3440,6 @@
third_party/base,
src/common/third_party/base,
);
- OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
};
name = Release;
};
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (259465 => 259466)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,16 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-03-27 Kenneth Russell <[email protected]>
Use ANGLE_robust_client_memory to replace framebuffer/texture validation
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -71,10 +71,6 @@
TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600;
TARGET_MAC_OS_X_VERSION_MAJOR_17 = 101700;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
Modified: trunk/Source/ThirdParty/ChangeLog (259465 => 259466)
--- trunk/Source/ThirdParty/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * gtest/xcode/Config/General.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-03-01 Ting-Wei Lan <[email protected]>
Re-add the patch used to work around gtest linking failure on FreeBSD
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (259465 => 259466)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -68,8 +68,5 @@
// VERSIONING BUILD SETTINGS (used in Info.plist)
GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc.
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (259465 => 259466)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-03 youenn fablet <[email protected]>
Remove rtpplay.exe from the libwebrtc source folder
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -92,9 +92,9 @@
DEAD_CODE_STRIPPING_normal = YES;
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -fvisibility=default;
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -fvisibility=default;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) -fvisibility=default;
+OTHER_CFLAGS = $(inherited) -fvisibility=default;
+OTHER_CPLUSPLUSFLAGS = $(inherited) -fvisibility=default;
+OTHER_LDFLAGS = $(inherited) -fvisibility=default;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(inherited) ABSL_ALLOCATOR_NOTHROW;
Modified: trunk/Source/WTF/ChangeLog (259465 => 259466)
--- trunk/Source/WTF/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WTF/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-02 Commit Queue <[email protected]>
Unreviewed, reverting r259390.
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -131,10 +131,6 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Modified: trunk/Source/WebCore/ChangeLog (259465 => 259466)
--- trunk/Source/WebCore/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebCore/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-03 Wenson Hsieh <[email protected]>
Add logging to help diagnose <webkit.org/b/209685>
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -122,9 +122,7 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
// This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
Modified: trunk/Source/WebCore/PAL/ChangeLog (259465 => 259466)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-02 Per Arne Vollan <[email protected]>
Unreviewed build fix after r259396.
Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -122,10 +122,6 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iphonesimulator = cocoatouch;
Modified: trunk/Source/WebInspectorUI/ChangeLog (259465 => 259466)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-02 Devin Rousso <[email protected]>
Context menu for local storage puts quotes around key and value
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -79,10 +79,6 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
COMBINE_INSPECTOR_RESOURCES = YES;
COMBINE_TEST_RESOURCES = NO;
Modified: trunk/Source/WebKit/ChangeLog (259465 => 259466)
--- trunk/Source/WebKit/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebKit/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-03 Wenson Hsieh <[email protected]>
Add logging to help diagnose <webkit.org/b/209685>
Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/WebKit/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -122,9 +122,7 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
SUPPORTS_TEXT_BASED_API[sdk=iphone*] = YES;
SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (259465 => 259466)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-01 Darin Adler <[email protected]>
Remove all uses of live ranges from TextIterator
Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -122,9 +122,7 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
Modified: trunk/Source/bmalloc/ChangeLog (259465 => 259466)
--- trunk/Source/bmalloc/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/bmalloc/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,15 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-01 Michael Catanzaro <[email protected]>
Update check for aarch64
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -125,10 +125,6 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
Modified: trunk/Tools/ChangeLog (259465 => 259466)
--- trunk/Tools/ChangeLog 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/ChangeLog 2020-04-03 16:51:30 UTC (rev 259466)
@@ -1,3 +1,30 @@
+2020-04-03 David Kilzer <[email protected]>
+
+ [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited)
+ <https://webkit.org/b/209963>
+ <rdar://problem/61257504>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * asan/asan.xcconfig:
+ - Use $(inherited) to get rid of custom ASAN_OTHER_CFLAGS and
+ ASAN_OTHER_CPLUSPLUSFLAGS. Note that ASAN_OTHER_LDFLAGS had
+ been previously removed in r179312, but not in the other
+ *.xcconfig files.
+
+ * ContentExtensionTester/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * ImageDiff/cg/Configurations/Base.xcconfig:
+ * MiniBrowser/Configurations/Base.xcconfig:
+ * MobileMiniBrowser/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * WebEditingTester/Configurations/Base.xcconfig:
+ * WebKitLauncher/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * lldb/lldbWebKitTester/Configurations/Base.xcconfig:
+ - Remove ASAN_OTHER_CFLAGS, ASAN_OTHER_CPLUSPLUSFLAGS and
+ ASAN_OTHER_LDFLAGS.
+
2020-04-03 Aakash Jain <[email protected]>
[ews] Improve error message when patch fails to apply to trunk
Modified: trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -85,7 +85,3 @@
GCC_OPTIMIZATION_LEVEL_debug = 0;
SDKROOT = macosx.internal;
-
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -105,9 +105,8 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+OTHER_CFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
+OTHER_CPLUSPLUSFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework;
WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources;
Modified: trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -82,7 +82,3 @@
AD_HOC_CODE_SIGNING_ALLOWED = YES;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
-
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -81,8 +81,4 @@
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
CODE_SIGN_IDENTITY = -;
Modified: trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -84,8 +84,4 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator;
SDKROOT = macosx.internal;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
CODE_SIGN_IDENTITY = -;
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -102,10 +102,8 @@
EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.h *IOS.cpp *IOS.mm;
EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *Mac.h *Mac.cpp *Mac.mm */mac/*;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) --system-header-prefix=WebKit/;
+OTHER_CFLAGS = $(inherited) --system-header-prefix=WebKit/;
OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
Modified: trunk/Tools/WebEditingTester/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -63,7 +63,3 @@
TARGET_MAC_OS_X_VERSION_MAJOR_17 = 101700;
SDKROOT = macosx.internal;
-
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -37,7 +37,3 @@
WARNING_CFLAGS = -Wall;
ENABLE_SPARKLE = 0;
-
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -106,10 +106,6 @@
FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_maccatalyst = cocoatouch;
Modified: trunk/Tools/asan/asan.xcconfig (259465 => 259466)
--- trunk/Tools/asan/asan.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/asan/asan.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -7,8 +7,9 @@
ENABLE_ADDRESS_SANITIZER_ = YES;
ENABLE_ADDRESS_SANITIZER_NO = YES;
-ASAN_OTHER_CFLAGS = -fno-omit-frame-pointer -g;
-ASAN_OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CFLAGS = $(inherited) $(WK_ASAN_OTHER_CFLAGS_$(ENABLE_ADDRESS_SANITIZER));
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_ASAN_OTHER_CFLAGS_$(ENABLE_ADDRESS_SANITIZER));
+WK_ASAN_OTHER_CFLAGS_YES = -fno-omit-frame-pointer -g;
// Workaround for rdar://problem/49498092
OTHER_LDFLAGS = $(inherited) $(WK_LDFLAGS_ASAN_$(ENABLE_ADDRESS_SANITIZER));
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (259465 => 259466)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig 2020-04-03 16:43:13 UTC (rev 259465)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig 2020-04-03 16:51:30 UTC (rev 259466)
@@ -114,7 +114,3 @@
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
SDKROOT = macosx.internal;
-
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
