Title: [153288] trunk/Tools
Revision
153288
Author
[email protected]
Date
2013-07-24 21:05:15 -0700 (Wed, 24 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: trunk/Tools/ChangeLog (153287 => 153288)


--- trunk/Tools/ChangeLog	2013-07-25 04:05:13 UTC (rev 153287)
+++ trunk/Tools/ChangeLog	2013-07-25 04:05:15 UTC (rev 153288)
@@ -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: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (153287 => 153288)


--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-07-25 04:05:13 UTC (rev 153287)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-07-25 04:05:15 UTC (rev 153288)
@@ -157,8 +157,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