Title: [163198] trunk/Tools
- Revision
- 163198
- Author
- [email protected]
- Date
- 2014-01-31 13:59:39 -0800 (Fri, 31 Jan 2014)
Log Message
Having a custom LLVM checkout should always override all other ways of getting LLVM
https://bugs.webkit.org/show_bug.cgi?id=128015
Reviewed by Oliver Hunt.
* Scripts/copy-webkitlibraries-to-product-directory:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (163197 => 163198)
--- trunk/Tools/ChangeLog 2014-01-31 21:59:02 UTC (rev 163197)
+++ trunk/Tools/ChangeLog 2014-01-31 21:59:39 UTC (rev 163198)
@@ -1,3 +1,12 @@
+2014-01-31 Filip Pizlo <[email protected]>
+
+ Having a custom LLVM checkout should always override all other ways of getting LLVM
+ https://bugs.webkit.org/show_bug.cgi?id=128015
+
+ Reviewed by Oliver Hunt.
+
+ * Scripts/copy-webkitlibraries-to-product-directory:
+
2014-01-31 Daniel Bates <[email protected]>
WebKit Bot Watcher's Dashboard: Teach JSON.load() to take optional failure callback function
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (163197 => 163198)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-01-31 21:59:02 UTC (rev 163197)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-01-31 21:59:39 UTC (rev 163198)
@@ -122,35 +122,35 @@
my $majorDarwinVersion = (split /\./, `uname -r`)[0];
my $useOwnLLVM = 0;
my $ownLLVMDirectory;
- if ($llvmLibraryPackage eq "" && $llvmIncludePackage eq "") {
- if (defined($ENV{LLVM_SOURCE_PATH})) {
- $useOwnLLVM = 1;
- $ownLLVMDirectory = $ENV{LLVM_SOURCE_PATH};
- } elsif (-d "llvm" && -e "llvm/LLVMBuild.txt") {
- $useOwnLLVM = 1;
- $ownLLVMDirectory = sourceDir() . "/llvm";
- } elsif (defined($ENV{LLVM_LIBRARY_PACKAGE}) && defined($ENV{LLVM_INCLUDE_PACKAGE})) {
- $llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
- $llvmIncludePackage = $ENV{LLVM_INCLUDE_PACKAGE};
- } elsif ($majorDarwinVersion == 11) {
- $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesLion.tar.bz2";
- $llvmIncludePackage = "WebKitLibraries/LLVMIncludesLion.tar.bz2";
- } elsif ($majorDarwinVersion == 12) {
- $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
- $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
- } elsif ($majorDarwinVersion == 13) {
- $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
- $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
- } else {
- print "Don't know where to find LLVM!\n";
- print "\n";
- print "Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE or setting the\n";
- print "--use-llvm-includes and --use-llvm-libraries options.\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;
- }
+ if (defined($ENV{LLVM_SOURCE_PATH})) {
+ $useOwnLLVM = 1;
+ $ownLLVMDirectory = $ENV{LLVM_SOURCE_PATH};
+ } elsif (-d "llvm" && -e "llvm/LLVMBuild.txt") {
+ $useOwnLLVM = 1;
+ $ownLLVMDirectory = sourceDir() . "/llvm";
+ } elsif ($llvmLibraryPackage ne "" && $llvmIncludePackage ne "") {
+ # Command-line arguments override our other ways of finding the packages.
+ } elsif (defined($ENV{LLVM_LIBRARY_PACKAGE}) && defined($ENV{LLVM_INCLUDE_PACKAGE})) {
+ $llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
+ $llvmIncludePackage = $ENV{LLVM_INCLUDE_PACKAGE};
+ } elsif ($majorDarwinVersion == 11) {
+ $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesLion.tar.bz2";
+ $llvmIncludePackage = "WebKitLibraries/LLVMIncludesLion.tar.bz2";
+ } elsif ($majorDarwinVersion == 12) {
+ $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
+ $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
+ } elsif ($majorDarwinVersion == 13) {
+ $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
+ $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
+ } else {
+ print "Don't know where to find LLVM!\n";
+ print "\n";
+ print "Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE or setting the\n";
+ print "--use-llvm-includes and --use-llvm-libraries options.\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;
}
sub fileContains
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
