[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/icecream/client
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-05-31 0:03:02
Message-ID: 1149033782.545645.22960.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 546773 by mueller:

fix packing of cc1 and cc1plus when non-standard gcc
installations are involved. just put them into /usr/bin,
the wrappers will find them there after a while of stat'ing.


 M  +5 -9      create-env  


--- branches/work/icecream/client/create-env #546772:546773
@@ -83,8 +83,8 @@
 add_file $added_gxx /usr/bin/g++
 add_file /usr/bin/as
 
-add_file `$added_gcc -print-prog-name=cc1`
-add_file `$added_gxx -print-prog-name=cc1plus`
+add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1
+add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus
 specfile=`$added_gcc -print-file-name=specs`
 if test -n "$specfile" && test -e "$specfile"; then
   add_file "$specfile"
@@ -105,17 +105,13 @@
   esac
   mkdir -p $tempdir/`dirname $target`
   cp -p $path $tempdir/$target
+  if test -f $tempdir/$target -a -x $tempdir/$target; then
+    strip -s $tempdir/$target 2>/dev/null
+  fi
   target=`echo $target | cut -b2-`
   new_target_files="$new_target_files $target"
 done
 
-# now strip the target files as necessary
-for i in $target_files; do 
-  if test -f $tempdir/$i -a -x $tempdir/$i; then
-    strip -s $tempdir/$i
-  fi
-done
-
 # now sort the files in order to make the md5sums independent
 # of ordering
 target_files=`for i in $new_target_files; do echo $i; done | sort`
[prev in list] [next in list] [prev in thread] [next in thread]