From acee0d7f6746c4d35ae94d6427d7f1c32cf0dce9 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sun, 3 Sep 2000 03:14:30 +0000 Subject: [PATCH] * ltmain.in (variables_saved_for_relink): Attempt to unset them instead of setting them to an empty string. --- ChangeLog | 5 +++++ ltmain.in | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fefb10e55..1f5187690 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-03 Alexandre Oliva + + * ltmain.in (variables_saved_for_relink): Attempt to unset them + instead of setting them to an empty string. + 2000-09-02 Alexandre Oliva * demo/Makefile.am: Don't extract configuration variables directly diff --git a/ltmain.in b/ltmain.in index 23cfb4aab..d05954125 100644 --- a/ltmain.in +++ b/ltmain.in @@ -3602,9 +3602,14 @@ static const void *lt_preloaded_setup() { if test -n "$relink_command"; then # Preserve any variables that may affect compiler behavior for var in $variables_saved_for_relink; do - eval var_value=\$$var - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` + relink_command="$var=\"$var_value\"; export $var; $relink_command" + fi done relink_command="cd `pwd`; $relink_command" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` @@ -3920,9 +3925,14 @@ fi\ # Preserve any variables that may affect compiler behavior for var in $variables_saved_for_relink; do - eval var_value=\$$var - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` + relink_command="$var=\"$var_value\"; export $var; $relink_command" + fi done # Quote the link command for shipping. relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" -- 2.47.3