Title: [152947] branches/dfgFourthTier/Tools
Revision
152947
Author
[email protected]
Date
2013-07-20 17:31:33 -0700 (Sat, 20 Jul 2013)

Log Message

fourthTier: We should use the no-asserts build of LLVM if that's what the user configured
https://bugs.webkit.org/show_bug.cgi?id=118947

Reviewed by Dan Bernstein.

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

Modified Paths

Diff

Modified: branches/dfgFourthTier/Tools/ChangeLog (152946 => 152947)


--- branches/dfgFourthTier/Tools/ChangeLog	2013-07-20 22:23:23 UTC (rev 152946)
+++ branches/dfgFourthTier/Tools/ChangeLog	2013-07-21 00:31:33 UTC (rev 152947)
@@ -1,3 +1,12 @@
+2013-07-20  Filip Pizlo  <[email protected]>
+
+        fourthTier: We should use the no-asserts build of LLVM if that's what the user configured
+        https://bugs.webkit.org/show_bug.cgi?id=118947
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+
 2013-07-16  Filip Pizlo  <[email protected]>
 
         fourthTier: We should have a reduced FTL LLVM pipeline tool in the repository

Modified: branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory (152946 => 152947)


--- branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-07-20 22:23:23 UTC (rev 152946)
+++ branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-07-21 00:31:33 UTC (rev 152947)
@@ -142,8 +142,11 @@
         $ownLLVMBuildMode .= "Debug";
     }
     
-    # FIXME: Add support for builds that disable assertions.
-    $ownLLVMBuildMode .= "+Asserts";
+    if (fileContains($ownLLVMDirectory . "/Makefile.config", "DISABLE_ASSERTIONS=1")) {
+        # Nothing to do.
+    } else {
+        $ownLLVMBuildMode .= "+Asserts";
+    }
     
     my $librarySourceDirectory = "$ownLLVMDirectory/$ownLLVMBuildMode/lib";
     my $libraryTargetDirectory = $productDir;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to