Changeset 185110 in webkit

Timestamp:

Jun 2, 2015, 10:48:23 AM (10 years ago)

Author:

mark.lam@apple.com

Message:

build-jsc's --cloop option is broken.
​https://bugs.webkit.org/show_bug.cgi?id=145516

Reviewed by Darin Adler.

• Scripts/build-jsc:
• Make sure to disable the JIT when --cloop is specified. Did analogous fix for --ftljit.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-jsc (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-02  Mark Lam  <mark.lam@apple.com>
+
+        build-jsc's --cloop option is broken.
+        https://bugs.webkit.org/show_bug.cgi?id=145516
+
+        Reviewed by Darin Adler.
+
+        * Scripts/build-jsc:
+        - Make sure to disable the JIT when --cloop is specified.
+          Did analogous fix for --ftljit.
+
 2015-06-02  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/build-jsc

@@ -96 +96 @@
 
 if (cmakeBasedPortName()) {
-    $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
-    $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
+    $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=0" : " -DENABLE_JIT";
+    $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT" : " -DENABLE_FTL_JIT=0";
     # By default we build using all of the available CPUs
     $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
@@ -108 +108 @@
 
 if (isAppleMacWebKit()) {
-    push @options, ($forceCLoop ? "ENABLE_JIT=" : "ENABLE_JIT=ENABLE_JIT");
-    push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT" : "ENABLE_FTL_JIT=");
+    push @options, ($forceCLoop ? "ENABLE_JIT=ENABLE_JIT=0" : "ENABLE_JIT=ENABLE_JIT");
+    push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT" : "ENABLE_FTL_JIT=ENABLE_FTL_JIT=0");
 
     if ($copyLibraries) {