Changeset 190775 in webkit

Timestamp:

Oct 8, 2015 9:01:54 PM (9 years ago)

Author:

dbates@webkit.org

Message:

Teach build-webkit to install LLVM binaries for iOS when building for device with the public iOS SDK
​https://bugs.webkit.org/show_bug.cgi?id=149943

Reviewed by Dan Bernstein.

Following the addition of the LLVM binaries for iOS in changeset r190759 (bug #149913) we should
teach build-webkit to install them when building for iOS device using the public iOS SDK.

• Scripts/build-webkit:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-10-08  Daniel Bates  <dabates@apple.com>
+
+        Teach build-webkit to install LLVM binaries for iOS when building for device with the public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=149943
+
+        Reviewed by Dan Bernstein.
+
+        Following the addition of the LLVM binaries for iOS in changeset r190759 (bug #149913) we should
+        teach build-webkit to install them when building for iOS device using the public iOS SDK. 
+
+        * Scripts/build-webkit:
+
 2015-10-08  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -194 +194 @@
         (system(@copyLibrariesArgs) == 0) or die;
     } else {
-        my @copyLibrariesArgs = (
-            "perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
-            "--sdk", xcodeSDK(), "--wksi", "--llvm", "--prefer-system-llvm",
-            "--llvm-subdirectory", "internal-llvm", productDir(),
-            "--llvm-prefix", "/usr/local"
-        );
+        my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--sdk", xcodeSDK(), "--wksi");
+        push @copyLibrariesArgs, "--llvm" if willUseIOSDeviceSDKWhenBuilding();
+        if (my $hasInternalSDK = xcodeSDK() eq "iphoneos.internal") {
+            push @copyLibrariesArgs, (
+                "--prefer-system-llvm",
+                "--llvm-subdirectory", "internal-llvm",
+                "--llvm-prefix", "/usr/local",
+            );
+        }
+        push @copyLibrariesArgs, productDir();
         print(join(" ", @copyLibrariesArgs) . "\n");
         (system(@copyLibrariesArgs) == 0) or die;