Title: [230709] trunk/Source/_javascript_Core
Revision
230709
Author
[email protected]
Date
2018-04-17 08:06:09 -0700 (Tue, 17 Apr 2018)

Log Message

Fix duplicate symbol errors when building _javascript_Core with non-empty WK_ALTERNATE_WEBKIT_SDK_PATH
https://bugs.webkit.org/show_bug.cgi?id=184602

Reviewed by Beth Dakin.

* _javascript_Core.xcodeproj/project.pbxproj:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (230708 => 230709)


--- trunk/Source/_javascript_Core/ChangeLog	2018-04-17 14:55:42 UTC (rev 230708)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-04-17 15:06:09 UTC (rev 230709)
@@ -1,3 +1,12 @@
+2018-04-17  Jer Noble  <[email protected]>
+
+        Fix duplicate symbol errors when building _javascript_Core with non-empty WK_ALTERNATE_WEBKIT_SDK_PATH
+        https://bugs.webkit.org/show_bug.cgi?id=184602
+
+        Reviewed by Beth Dakin.
+
+        * _javascript_Core.xcodeproj/project.pbxproj:
+
 2018-04-17  Carlos Garcia Campos  <[email protected]>
 
         [GLIB] Add API to clear JSCContext uncaught exception

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (230708 => 230709)


--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2018-04-17 14:55:42 UTC (rev 230708)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2018-04-17 15:06:09 UTC (rev 230709)
@@ -9907,7 +9907,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -e\n\nif [[ -f \"${BUILT_PRODUCTS_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/libWTF.a\" ]]; then\n    ln -s -f -h \"${BUILT_PRODUCTS_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nelse\n    ln -s -f -h \"${SDK_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/lib/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nfi";
+			shellScript = "set -e\n\nif [[ -f \"${BUILT_PRODUCTS_DIR}/libWTF.a\" ]]; then\n    ln -s -f -h \"${BUILT_PRODUCTS_DIR}/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nelse\n    ln -s -f -h \"${SDK_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/lib/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nfi";
 		};
 		53B4BD091F68AF8900D2BEA3 /* Generate Unified Sources */ = {
 			isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to