Title: [165658] trunk/Tools
- Revision
- 165658
- Author
- [email protected]
- Date
- 2014-03-14 15:39:06 -0700 (Fri, 14 Mar 2014)
Log Message
Sometimes we need to be explicit about the SDK when running ranlib on Darwin
https://bugs.webkit.org/show_bug.cgi?id=130265
Reviewed by Michael Saboff.
* Scripts/build-webkit:
* Scripts/copy-webkitlibraries-to-product-directory:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165657 => 165658)
--- trunk/Tools/ChangeLog 2014-03-14 22:24:36 UTC (rev 165657)
+++ trunk/Tools/ChangeLog 2014-03-14 22:39:06 UTC (rev 165658)
@@ -1,3 +1,13 @@
+2014-03-14 Filip Pizlo <[email protected]>
+
+ Sometimes we need to be explicit about the SDK when running ranlib on Darwin
+ https://bugs.webkit.org/show_bug.cgi?id=130265
+
+ Reviewed by Michael Saboff.
+
+ * Scripts/build-webkit:
+ * Scripts/copy-webkitlibraries-to-product-directory:
+
2014-03-14 Landry Breuil <[email protected]>
Recognize openbsd/netbsd and am64 archs in Tools/Scripts.
Modified: trunk/Tools/Scripts/build-webkit (165657 => 165658)
--- trunk/Tools/Scripts/build-webkit 2014-03-14 22:24:36 UTC (rev 165657)
+++ trunk/Tools/Scripts/build-webkit 2014-03-14 22:39:06 UTC (rev 165658)
@@ -232,8 +232,8 @@
if ($hasFTLJIT) {
my @copyLibrariesArgs = (
"perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory",
- "--llvm", "--prefer-system-llvm", "--llvm-subdirectory", "internal-llvm",
- productDir()
+ "--sdk", xcodeSDK(), "--llvm", "--prefer-system-llvm",
+ "--llvm-subdirectory", "internal-llvm", productDir()
);
print(join(" ", @copyLibrariesArgs) . "\n");
(system(@copyLibrariesArgs) == 0) or die;
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (165657 => 165658)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-03-14 22:24:36 UTC (rev 165657)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-03-14 22:39:06 UTC (rev 165658)
@@ -38,6 +38,7 @@
my $useFullLibPaths = 0;
my $preferSystemLLVMOverDrops = 0;
my $llvmSubdirectoryName = "llvm";
+my $sdkName = "";
my $force = 0;
my $programName = basename($0);
@@ -51,6 +52,7 @@
--[no-]use-full-lib-paths Toggle using full library paths
--[no-]prefer-system-llvm Toggle preferring the system LLVM over the binary drops (default: $preferSystemLLVMOverDrops)
--llvm-subdirectory=<name> Set the name of the LLVM subdirectory to search for (default: $llvmSubdirectoryName)
+ --sdk-name=<name> Set the name of the Xcode SDK to use.
--[no-]force Toggle forcing the copy - i.e. ignoring timestamps (default: $force)
EOF
@@ -63,6 +65,7 @@
'use-full-lib-paths!' => \$useFullLibPaths,
'prefer-system-llvm!' => \$preferSystemLLVMOverDrops,
'llvm-subdirectory=s' => \$llvmSubdirectoryName,
+ 'sdk-name=s' => \$sdkName,
'force!' => \$force
);
@@ -80,7 +83,11 @@
chdirWebKit();
-my $ranlib = `xcrun -find ranlib`;
+my $xcrunOptions = "";
+if ($sdkName ne "") {
+ $xcrunOptions .= " -sdk $sdkName";
+}
+my $ranlib = `xcrun $xcrunOptions -find ranlib`;
chomp $ranlib;
sub unpackIfNecessary
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
