[webkit-changes] [163492] tags/Safari-538.16.2/Tools

Wed, 05 Feb 2014 16:45:37 -0800

Title: [163492] tags/Safari-538.16.2/Tools
Revision
163492
Author
[email protected]
Date
2014-02-05 16:49:42 -0800 (Wed, 05 Feb 2014)

Log Message

Merged r163423.  


Modified Paths

Diff

Modified: tags/Safari-538.16.2/Tools/ChangeLog (163491 => 163492)


--- tags/Safari-538.16.2/Tools/ChangeLog	2014-02-06 00:48:20 UTC (rev 163491)
+++ tags/Safari-538.16.2/Tools/ChangeLog	2014-02-06 00:49:42 UTC (rev 163492)
@@ -1,5 +1,15 @@
 2014-02-05  Lucas Forschler  <[email protected]>
 
+        Merge r163423
+
+    2014-02-04  Filip Pizlo  <[email protected]>
+
+            Fix build when the script is called from Xcode.
+
+            * Scripts/copy-webkitlibraries-to-product-directory:
+
+2014-02-05  Lucas Forschler  <[email protected]>
+
         Merge r163418
 
     2014-02-04  Filip Pizlo  <[email protected]>

Modified: tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory (163491 => 163492)


--- tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory	2014-02-06 00:48:20 UTC (rev 163491)
+++ tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory	2014-02-06 00:49:42 UTC (rev 163492)
@@ -182,7 +182,7 @@
 
         print("Building LLVM.\n");
         chdir $ownLLVMDirectory;
-        (system("make -j `sysctl -n hw.activecpu`") == 0) or die;
+        (system("(unset PROJECT_NAME ; make -j `sysctl -n hw.activecpu`)") == 0) or die;
         chdirWebKit();
         
         my $ownLLVMBuildMode = "";

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to