Attachment 198988 Details for Bug 114933 – the patch

[patch] the patch

blah.patch (text/plain), 1.95 KB, created by Filip Pizlo on 2013-04-21 22:18:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Filip Pizlo

Created: 2013-04-21 22:18:35 PDT

Size: 1.95 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 148852)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+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 NOBODY (OOPS!).
>+        
>+        This makes it easy to get set up for tandem LLVM builds.
>+
>+        * Scripts/copy-webkitlibraries-to-product-directory:
>+
> 2013-04-21  Filip Pizlo  <fpizlo@apple.com>
> 
>         fourthTier: WebKit's build system should relink JavaScriptCore if LLVM's libraries changed but its headers didn't
>Index: Tools/Scripts/copy-webkitlibraries-to-product-directory
>===================================================================
>--- Tools/Scripts/copy-webkitlibraries-to-product-directory	(revision 148852)
>+++ Tools/Scripts/copy-webkitlibraries-to-product-directory	(working copy)
>@@ -74,7 +74,11 @@ if (defined($ENV{LLVM_SOURCE_PATH})) {
>     $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 @@ sub fileContentsEquals
> my $shouldUpdateLLVMLibraryToken;
> 
> if ($useOwnLLVM) {
>-    print("Building LLVM.\n");
>     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");
>     my $numCPUString = `sysctl hw.ncpu`;
>     $numCPUString =~ /: /;
>     my $numCPUs = $';

Flags:

aestes: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 114933: 198988