Title: [148853] branches/dfgFourthTier/Tools
Revision
148853
Author
[email protected]
Date
2013-04-21 22:32:29 -0700 (Sun, 21 Apr 2013)

Log Message

fourthTier: tandem WebKit and LLVM builds should ./configure LLVM if needed
https://bugs.webkit.org/show_bug.cgi?id=114933

Reviewed by Andy Estes.
        
This makes it easy to get set up for tandem LLVM builds.

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

Modified Paths

Diff

Modified: branches/dfgFourthTier/Tools/ChangeLog (148852 => 148853)


--- branches/dfgFourthTier/Tools/ChangeLog	2013-04-22 04:39:07 UTC (rev 148852)
+++ branches/dfgFourthTier/Tools/ChangeLog	2013-04-22 05:32:29 UTC (rev 148853)
@@ -1,5 +1,16 @@
 2013-04-21  Filip Pizlo  <[email protected]>
 
+        fourthTier: tandem WebKit and LLVM builds should ./configure LLVM if needed
+        https://bugs.webkit.org/show_bug.cgi?id=114933
+
+        Reviewed by Andy Estes.
+        
+        This makes it easy to get set up for tandem LLVM builds.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+
+2013-04-21  Filip Pizlo  <[email protected]>
+
         fourthTier: WebKit's build system should relink _javascript_Core if LLVM's libraries changed but its headers didn't
         https://bugs.webkit.org/show_bug.cgi?id=114926
 

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


--- branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-04-22 04:39:07 UTC (rev 148852)
+++ branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-04-22 05:32:29 UTC (rev 148853)
@@ -74,7 +74,11 @@
     $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
 } else {
     print "Don't know where to find LLVM!\n";
+    print "\n";
     print "Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE.\n";
+    print "\n";
+    print "Alternatively, you can check out llvm trunk into the WebKit directory:\n";
+    print "svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm\n";
     exit 1;
 }
 
@@ -120,8 +124,14 @@
 my $shouldUpdateLLVMLibraryToken;
 
 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;
+    }
+    
     print("Building LLVM.\n");
-    chdir $ownLLVMDirectory;
     my $numCPUString = `sysctl hw.ncpu`;
     $numCPUString =~ /: /;
     my $numCPUs = $';
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to