Modified: trunk/Tools/ChangeLog (190774 => 190775)
--- trunk/Tools/ChangeLog 2015-10-09 02:37:29 UTC (rev 190774)
+++ trunk/Tools/ChangeLog 2015-10-09 04:01:54 UTC (rev 190775)
@@ -1,5 +1,17 @@
2015-10-08 Daniel Bates <[email protected]>
+ 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 <[email protected]>
+
Add LLVM binaries for iOS 9 device
https://bugs.webkit.org/show_bug.cgi?id=149913
Modified: trunk/Tools/Scripts/build-webkit (190774 => 190775)
--- trunk/Tools/Scripts/build-webkit 2015-10-09 02:37:29 UTC (rev 190774)
+++ trunk/Tools/Scripts/build-webkit 2015-10-09 04:01:54 UTC (rev 190775)
@@ -193,12 +193,16 @@
print(join(" ", @copyLibrariesArgs) . "\n");
(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;
