[patch] librep-libtool.patch

librep-libtool.patch (text/plain), 1.71 KB, created by Harald van Dijk (RETIRED) on 2005-01-13 23:11:06 UTC

--- ltmain.sh.orig
+++ ltmain.sh
@@ -532,8 +532,14 @@
 	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+	    trimedcc="${CC/${host}-}"
 	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+	    tagname=CC
+	    break ;;
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\
+	    "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1636,8 +1642,14 @@
 	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+	    trimedcc="${CC/${host}-}"
 	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+	    tagname=CC
+	    break ;;
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\
+	    "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*)
 	      # The compiler in $compile_command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.