Changeset 112431 in webkit

Timestamp:

Mar 28, 2012 1:13:27 PM (12 years ago)

Author:

ddkilzer@apple.com

Message:

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().

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (3 diffs)
• Scripts/webkitdirs.pm (modified) (4 diffs)
• Scripts/webkitperl/features.pm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/Scripts/build-webkit

@@ -1 +1 @@
 #!/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.
@@ -556 +556 @@
         "libWebCoreSQLite3.a",
     );
+
+    my $ranlib = `xcrun -find ranlib`;
+    chomp $ranlib;
     foreach my $libName (@librariesToCopy) {
         my $srcLib = "WebKitLibraries/" . $libName;
@@ -562 +565 @@
             print "Updating $lib\n";
             system "ditto", $srcLib, $lib;
-            system "ranlib", $lib;
+            system $ranlib, $lib;
         }
     }

trunk/Tools/Scripts/webkitdirs.pm

@@ -1 @@
-# 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.
@@ -57 +57 @@
        &currentSVNRevision
        &debugSafari
+       &nmPath
        &passedConfiguration
        &printHelpAndExitForRunAndDebugWebKitAppIfNeeded
@@ -82 +83 @@
 my $sourceDir;
 my $currentSVNRevision;
+my $nmPath;
 my $osXVersion;
 my $generateDsym;
@@ -1308 +1310 @@
 }
 
+sub determineNmPath()
+{
+    return if $nmPath;
+
+    if (isAppleMacWebKit()) {
+        $nmPath = `xcrun -find nm`;
+        chomp $nmPath;
+    }
+    $nmPath = "nm" if !$nmPath;
+}
+
+sub nmPath()
+{
+    determineNmPath();
+    return $nmPath;
+}
+
 sub determineOSXVersion()
 {

trunk/Tools/Scripts/webkitperl/features.pm

@@ -1 @@
-# 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
@@ -32 +32 @@
 use warnings;
 
+use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
+
 BEGIN {
    use Exporter   ();
@@ -54 +58 @@
     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.