From 3a6804018eb23f8ab92c6579a9ff0b41484c76e2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 3 Dec 2005 08:34:11 +0000 Subject: [PATCH] * ltmain.in (func_extract_archives, compile mode, link mode): Use `$exit_status' rather than forbidden `$status'. --- ChangeLog | 5 +++++ ltmain.in | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa2575a8e..57dcaea62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-03 Ralf Wildenhues + + * ltmain.in (func_extract_archives, compile mode, link mode): + Use `$exit_status' rather than forbidden `$status'. + 2005-11-28 Ralf Wildenhues * ltmain.in: Fix typo introduced in dllsearchpath backport. diff --git a/ltmain.in b/ltmain.in index 63ecec623..fa58bf10c 100644 --- a/ltmain.in +++ b/ltmain.in @@ -294,9 +294,9 @@ func_extract_archives () $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -855,9 +855,9 @@ EOF if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1920,9 +1920,9 @@ EOF if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -4607,7 +4607,7 @@ static const void *lt_preloaded_setup() { # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4615,7 +4615,7 @@ static const void *lt_preloaded_setup() { $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -5343,9 +5343,9 @@ fi\ $run ${rm}r "$gentop" $show "$mkdir $gentop" $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$gentop"; then + exit $exit_status fi fi -- 2.47.3