Use xcrun to find nm and ranlib on OS X builds

<http://webkit.org/b/82466>

Reviewed by Dan Bernstein.

* Scripts/build-webkit: Use xcrun to find ranlib.
* Scripts/webkitdirs.pm:
(determineNmPath): Added.  Use xcrun to find nm on OS X.
(nmPath): Added.
* Scripts/webkitperl/features.pm:
(libraryContainsSymbol): Use nmPath().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112431 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9863267456c7dc83a4b5029127c0393b5b968557..02d216c232a50731442856ddebd92614314c9a23 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-28  David Kilzer  <ddkilzer@apple.com>
+
+        Use xcrun to find nm and ranlib on OS X builds
+        <http://webkit.org/b/82466>
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/build-webkit: Use xcrun to find ranlib.
+        * Scripts/webkitdirs.pm:
+        (determineNmPath): Added.  Use xcrun to find nm on OS X.
+        (nmPath): Added.
+        * Scripts/webkitperl/features.pm:
+        (libraryContainsSymbol): Use nmPath().
+
 2012-03-28  Ojan Vafai  <ojan@chromium.org>
 
         Add history navigation to garden-o-matic

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index fae1ce434fc4db52d583498fda25fe2c487cc115..d102a4ac6a641f06460ca4da708af1dd6e4cdeda 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2010 moiji-mobile.com All rights reserved.
 # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
@@ -555,13 +555,16 @@ if (isGtk()) {
         "libWebKitSystemInterfaceLion.a",
         "libWebCoreSQLite3.a",
     );
+
+    my $ranlib = `xcrun -find ranlib`;
+    chomp $ranlib;
     foreach my $libName (@librariesToCopy) {
         my $srcLib = "WebKitLibraries/" . $libName;
         my $lib = "$productDir/" . $libName;
         if (!-e $lib || -M $lib > -M $srcLib) {
             print "Updating $lib\n";
             system "ditto", $srcLib, $lib;
-            system "ranlib", $lib;
+            system $ranlib, $lib;
         }
     }
 

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 023dc5b8d931ff6f04320a8372867c63b34593ad..3cbb2ce25dd34a870b02386fe842e8fc7b160d80 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2010, 2012 Apple Inc. All rights reserved.
+# Copyright (C) 2005, 2006, 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
 #
@@ -56,6 +56,7 @@ BEGIN {
        &cmakeBasedPortName
        &currentSVNRevision
        &debugSafari
+       &nmPath
        &passedConfiguration
        &printHelpAndExitForRunAndDebugWebKitAppIfNeeded
        &productDir
@@ -81,6 +82,7 @@ my $configurationForVisualStudio;
 my $configurationProductDir;
 my $sourceDir;
 my $currentSVNRevision;
+my $nmPath;
 my $osXVersion;
 my $generateDsym;
 my $isQt;
@@ -1307,6 +1309,23 @@ sub isPerianInstalled()
     return 0;
 }
 
+sub determineNmPath()
+{
+    return if $nmPath;
+
+    if (isAppleMacWebKit()) {
+        $nmPath = `xcrun -find nm`;
+        chomp $nmPath;
+    }
+    $nmPath = "nm" if !$nmPath;
+}
+
+sub nmPath()
+{
+    determineNmPath();
+    return $nmPath;
+}
+
 sub determineOSXVersion()
 {
     return if $osXVersion;

diff --git a/Tools/Scripts/webkitperl/features.pm b/Tools/Scripts/webkitperl/features.pm
index 1df56405b822c0c7c264bdbe220ef34746af2263..89926197f6dff0ae2e6cbb5fd7fa08f441958538 100644 (file)
--- a/Tools/Scripts/webkitperl/features.pm
+++ b/Tools/Scripts/webkitperl/features.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved
 # Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
 # Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged
 #
@@ -31,6 +31,10 @@
 use strict;
 use warnings;
 
+use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
+
 BEGIN {
    use Exporter   ();
    our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
@@ -53,7 +57,7 @@ sub libraryContainsSymbol($$)
 
     my $foundSymbol = 0;
     if (-e $path) {
-        open NM, "-|", "nm", $path or die;
+        open NM, "-|", nmPath(), $path or die;
         while (<NM>) {
             $foundSymbol = 1 if /$symbol/; # FIXME: This should probably check for word boundaries before/after the symbol name.
         }