Title: [185102] trunk/Tools
Revision
185102
Author
[email protected]
Date
2015-06-01 20:29:39 -0700 (Mon, 01 Jun 2015)

Log Message

Unreviewed, rolling out r185066.
https://bugs.webkit.org/show_bug.cgi?id=145543

it breaks the FTL JIT builds with a local checkout of llvm
(Requested by pizlo on #webkit).

Reverted changeset:

"build-jsc's --cloop option is broken."
https://bugs.webkit.org/show_bug.cgi?id=145516
http://trac.webkit.org/changeset/185066

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (185101 => 185102)


--- trunk/Tools/ChangeLog	2015-06-02 03:13:26 UTC (rev 185101)
+++ trunk/Tools/ChangeLog	2015-06-02 03:29:39 UTC (rev 185102)
@@ -1,3 +1,17 @@
+2015-06-01  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r185066.
+        https://bugs.webkit.org/show_bug.cgi?id=145543
+
+        it breaks the FTL JIT builds with a local checkout of llvm
+        (Requested by pizlo on #webkit).
+
+        Reverted changeset:
+
+        "build-jsc's --cloop option is broken."
+        https://bugs.webkit.org/show_bug.cgi?id=145516
+        http://trac.webkit.org/changeset/185066
+
 2015-06-01  Daniel Bates  <[email protected]>
 
         Notify client that we began editing when text field is focused

Modified: trunk/Tools/Scripts/build-jsc (185101 => 185102)


--- trunk/Tools/Scripts/build-jsc	2015-06-02 03:13:26 UTC (rev 185101)
+++ trunk/Tools/Scripts/build-jsc	2015-06-02 03:29:39 UTC (rev 185102)
@@ -95,8 +95,8 @@
 }
 
 if (cmakeBasedPortName()) {
-    $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=0" : " -DENABLE_JIT=1";
-    $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT=1" : " -DENABLE_FTL_JIT=0";
+    $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
+    $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
     # By default we build using all of the available CPUs
     $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
 
@@ -107,8 +107,8 @@
 }
 
 if (isAppleMacWebKit()) {
-    push @options, ($forceCLoop ? "ENABLE_JIT=ENABLE_JIT=0" : "ENABLE_JIT=ENABLE_JIT=1");
-    push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT=1" : "ENABLE_FTL_JIT=ENABLE_FTL_JIT=0");
+    push @options, ($forceCLoop ? "ENABLE_JIT=" : "ENABLE_JIT=ENABLE_JIT");
+    push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT" : "ENABLE_FTL_JIT=");
 
     if ($copyLibraries) {
         my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to