From 33b25c9c7ac5c960991c71d641740dbc8fa432b5 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 4 May 2011 01:55:36 +0200 Subject: 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 --- solenv/bin/gccinstlib.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 8ce9753a4..d8eda1cb4 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 \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=; 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: $!"; } -- cgit v1.2.3