diff options
Diffstat (limited to 'Tools/Scripts/webkitperl/features.pm')
| -rw-r--r-- | Tools/Scripts/webkitperl/features.pm | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/Tools/Scripts/webkitperl/features.pm b/Tools/Scripts/webkitperl/features.pm index 1df56405b..e546c394b 100644 --- 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,13 +31,16 @@ use strict; use warnings; +use FindBin; +use lib $FindBin::Bin; +use webkitdirs; + BEGIN { use Exporter (); our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); $VERSION = 1.00; @ISA = qw(Exporter); - @EXPORT = qw(&checkWebCoreFeatureSupport - &removeLibraryDependingOnFeature); + @EXPORT = qw(&checkWebCoreFeatureSupport); %EXPORT_TAGS = ( ); @EXPORT_OK = (); } @@ -53,7 +56,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. } @@ -90,14 +93,4 @@ sub checkWebCoreFeatureSupport($$) return $hasFeature; } -sub removeLibraryDependingOnFeature($$$) -{ - my ($libraryName, $featureName, $shouldHaveFeature) = @_; - my $path = builtDylibPathForName($libraryName); - return unless -x $path; - - my $hasFeature = hasFeature($featureName, $path); - system "rm -f $path" if ($shouldHaveFeature xor $hasFeature); -} - 1; |