Title: [153127] trunk/Tools
- Revision
- 153127
- Author
- [email protected]
- Date
- 2013-07-24 20:58:55 -0700 (Wed, 24 Jul 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: trunk/Tools/ChangeLog (153126 => 153127)
--- trunk/Tools/ChangeLog 2013-07-25 03:58:53 UTC (rev 153126)
+++ trunk/Tools/ChangeLog 2013-07-25 03:58:55 UTC (rev 153127)
@@ -1,5 +1,20 @@
2013-07-16 Oliver Hunt <[email protected]>
+ Merge dfgFourthTier r148853
+
+ 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-07-16 Oliver Hunt <[email protected]>
+
Merge dfgFourthTier r148850
2013-04-21 Filip Pizlo <[email protected]>
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (153126 => 153127)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2013-07-25 03:58:53 UTC (rev 153126)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2013-07-25 03:58:55 UTC (rev 153127)
@@ -108,7 +108,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;
}
@@ -134,6 +138,14 @@
my $shouldUpdateLLVMLibraryToken = 0;
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`;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
