diff options
author | Eike Rathke <erack@apache.org> | 2011-08-29 23:58:38 +0000 |
---|---|---|
committer | Eike Rathke <erack@apache.org> | 2011-08-29 23:58:38 +0000 |
commit | c8f9f15b33a7e309a94a089285cb169f349bc4ad (patch) | |
tree | 7007508760a17e0df93e6a7f2d18ad652d213f97 /solenv | |
parent | 9fff7828a476d5a4677bbdcc73a5f3982a6a63a0 (diff) |
always request an unversioned lib from gcc in gccinstlib.pl
* this otherwise breaks on ubuntu natty as there is (rightfully) no libgcc_s.so.1 file served by gcc -print-file-name
-- Thanks to Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/gccinstlib.pl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 90c8f02a3e06..654c95b7290a 100755 --- a/solenv/bin/gccinstlib.pl +++ b/solenv/bin/gccinstlib.pl @@ -38,19 +38,23 @@ if ($Dest =~ /--help/ || @ARGV < 1) { print "Syntax:\n gcc-instlib <library-in-libpath ...> <destination-dir>\n"; exit (0); } + +%SrcAndDest = (); + foreach $File (@ARGV) { my $string; - - open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$File|") || die "Failed to exec $cc -print-file-name=$File $!"; + my $normalized_file = $File; + $normalized_file =~ s/\.so\.\d+/.so/; + open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!"; $string=<GCCOut>; chomp ($string); - push (@CopySrc, $string); + $SrcAndDest{$string} = "$Dest/$File"; close (GCCOut); } -foreach $Src (@CopySrc) { - printf "copy $Src to $Dest\n"; - system ("/bin/cp $Src $Dest") && die "copy failed: $!"; +while (($Src, $FullDest) = each %SrcAndDest) { + printf "copy $Src to $FullDest\n"; + system ("/bin/cp $Src $FullDest") && die "copy failed: $!"; } |