From: Robert Boehne Date: Thu, 4 Apr 2002 23:32:06 +0000 (+0000) Subject: * exe/compile-txt.tpl: Handle the case when no tag is explicitly set, X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=646383d19f62ccce394469c3fc40fc88f534adad;p=thirdparty%2Flibtool.git * exe/compile-txt.tpl: Handle the case when no tag is explicitly set, and $base_compile has a space in front of $CC, and revert the setting of tagname checked in on 2002-3-14. * exe/link-txt.tpl: Ditto. * exe/ltmain.tpl: Ditto. * ltmain.in: Ditto. --- diff --git a/ChangeLog b/ChangeLog index 2192f0876..391554f48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-04-03 Robert Boehne + + * exe/compile-txt.tpl: Handle the case when no tag is explicitly set, + and $base_compile has a space in front of $CC, and revert the setting + of tagname checked in on 2002-3-14. + * exe/link-txt.tpl: Ditto. + * exe/ltmain.tpl: Ditto. + * ltmain.in: Ditto. + 2002-03-14 Robert Boehne ltmain.in: Touch-up to make testsuite pass, and default tagname diff --git a/exe/compile-txt.tpl b/exe/compile-txt.tpl index 96d24c6ec..e3b59dd94 100644 --- a/exe/compile-txt.tpl +++ b/exe/compile-txt.tpl @@ -167,27 +167,22 @@ easier to understand. # command doesn't match the default compiler. if test -n "$available_tags" && test -z "$tagname"; then case "$base_compile " in - "$CC "*) ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when ltconfig was run. - "`$echo $CC` "*) ;; *) for z in $available_tags; do 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`" case "$base_compile " in - "$CC "*) + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. tagname=$z break ;; - "`$echo $CC` "*) - tagname=$z - break - ;; esac fi done diff --git a/exe/link-txt.tpl b/exe/link-txt.tpl index f74307c98..e1c34e0b3 100644 --- a/exe/link-txt.tpl +++ b/exe/link-txt.tpl @@ -751,27 +751,22 @@ # command doesn't match the default compiler. if test -n "$available_tags" && test -z "$tagname"; then case $base_compile in - "$CC "*) ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when ltconfig was run. - "`$echo $CC` "*) ;; *) for z in $available_tags; do 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`" case $base_compile in - "$CC "*) + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) # The compiler in $compile_command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. tagname=$z break ;; - "`$echo $CC` "*) - tagname=$z - break - ;; esac fi done diff --git a/exe/ltmain.tpl b/exe/ltmain.tpl index b46fb6396..20c9149aa 100644 --- a/exe/ltmain.tpl +++ b/exe/ltmain.tpl @@ -83,9 +83,6 @@ show="$echo" show_help= execute_dlfiles= -# set the tag name so that it defaults to CC -tagname="CC" - # Parse our command line options once, thoroughly. while test "$#" -gt 0 do diff --git a/ltmain.in b/ltmain.in index a5134efe2..fc4412395 100644 --- a/ltmain.in +++ b/ltmain.in @@ -105,9 +105,6 @@ execute_dlfiles= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" -# set the tag name so that it defaults to CC -tagname="CC" - # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -470,28 +467,25 @@ if test -z "$show_help"; then # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. if test -n "$available_tags" && test -z "$tagname"; then - case "$base_compile " in - "$CC "*) ;; + case $base_compile in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when ltconfig was run. - "`$echo $CC` "*) ;; + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. *) for z in $available_tags; do 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`" case "$base_compile " in - "$CC "*) + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. tagname=$z break ;; - "`$echo $CC` "*) - tagname=$z - break - ;; esac fi done @@ -1520,27 +1514,24 @@ EOF # command doesn't match the default compiler. if test -n "$available_tags" && test -z "$tagname"; then case $base_compile in - "$CC "*) ;; # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when ltconfig was run. - "`$echo $CC` "*) ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. *) for z in $available_tags; do 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`" case $base_compile in - "$CC "*) + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) # The compiler in $compile_command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. tagname=$z break ;; - "`$echo $CC` "*) - tagname=$z - break - ;; esac fi done