Title: [153138] trunk/Tools
Revision
153138
Author
[email protected]
Date
2013-07-24 20:59:19 -0700 (Wed, 24 Jul 2013)

Log Message

fourthTier: Use hw.availcpu instead of hw.ncpu, and configure LLVM with --enable-zlib=no

Rubber stamped by Mark Rowe.

* Scripts/copy-webkitlibraries-to-product-directory:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (153137 => 153138)


--- trunk/Tools/ChangeLog	2013-07-25 03:59:17 UTC (rev 153137)
+++ trunk/Tools/ChangeLog	2013-07-25 03:59:19 UTC (rev 153138)
@@ -1,3 +1,11 @@
+2013-04-30  Filip Pizlo  <[email protected]>
+
+        fourthTier: Use hw.availcpu instead of hw.ncpu, and configure LLVM with --enable-zlib=no
+
+        Rubber stamped by Mark Rowe.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+
 2013-07-16  Oliver Hunt <[email protected]>
 
         Merge dfgFourthTier r148853

Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (153137 => 153138)


--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-07-25 03:59:17 UTC (rev 153137)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-07-25 03:59:19 UTC (rev 153138)
@@ -140,18 +140,14 @@
     if ($useOwnLLVM) {
 
         chdir $ownLLVMDirectory;
-
         if (!-e "Makefile.config") {
             print("Configuring LLVM.\n");
-            (system("./configure --enable-optimized=yes --enable-backtraces=no --enable-targets=x86_64 --enable-libcpp=yes")==0) or die;
+            (system("./configure --enable-optimized=yes --enable-backtraces=no --enable-targets=x86_64 --enable-libcpp=yes --enable-zlib=no")==0) or die;
         }
 
         print("Building LLVM.\n");
         chdir $ownLLVMDirectory;
-        my $numCPUString = `sysctl hw.ncpu`;
-        $numCPUString =~ /: /;
-        my $numCPUs = $';
-        (system("make -j $numCPUs") == 0) or die;
+        (system("make -j `sysctl -n hw.availcpu`") == 0) or die;
         chdirWebKit();
         
         my $ownLLVMBuildMode = "";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to