From 0d3ae556976d27c6998f31f1a99df91bcd5907af Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Tue, 2 Oct 2012 18:08:29 +0700 Subject: [PATCH] libtool: use false or : for $wrappers_required, and simplify * build-aux/ltmain.m4sh (func_mode_link): Save a string comparison by setting $wrappers_required to false or : and using it directly with a ored block rather than an if statement. Signed-off-by: Gary V. Vaughan --- build-aux/ltmain.m4sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh index 7679d3d21..47b6390e4 100644 --- a/build-aux/ltmain.m4sh +++ b/build-aux/ltmain.m4sh @@ -8124,24 +8124,22 @@ EOF func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test yes != "$build_libtool_libs"; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) if test no = "$need_relink" || test yes != "$build_libtool_libs"; then - wrappers_required=no + wrappers_required=false fi ;; esac - if test no = "$wrappers_required"; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command=$compile_command$compile_rpath @@ -8162,7 +8160,7 @@ EOF fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -- 2.47.2