Commit a6b761cc authored by oliver@apple.com's avatar oliver@apple.com

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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153127 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f0c513fa
2013-07-16 Oliver Hunt <oliver@apple.com>
Merge dfgFourthTier r148853
2013-04-21 Filip Pizlo <fpizlo@apple.com>
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 <oliver@apple.com>
Merge dfgFourthTier r148850
......
......@@ -108,7 +108,11 @@ if ($ENV{ENABLE_FTL_JIT}) {
$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 @@ if ($ENV{ENABLE_FTL_JIT}) {
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`;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment