summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary V. Vaughan <gary@gnu.org>2012-10-02 18:08:29 +0700
committerGary V. Vaughan <gary@gnu.org>2012-10-02 21:06:32 +0700
commit4e05284e5143fb8d8c19b9e0e50830f90132d7fe (patch)
treebea099ff932141f01896308b318044c13a7a1b89
parent7ce429c52729130b360206c61396ffe2f5467134 (diff)
downloadlibtool-4e05284e5143fb8d8c19b9e0e50830f90132d7fe.tar.gz
libtool: use false or : for $my_pic_p, and simplify
* build-aux/ltmain.m4sh (func_generate_dlsyms): Save a string comparison by setting $my_pic_p to false or : and using it directly instead of calling if. Adjust all callers. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r--build-aux/ltmain.m4sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index 9771fcf0..6dc30003 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -2466,7 +2466,7 @@ func_generate_dlsyms ()
my_outputname=$1
my_originator=$2
- my_pic_p=${3-no}
+ my_pic_p=${3-false}
my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
@@ -2706,9 +2706,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test no != "$my_pic_p"; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -6789,7 +6787,7 @@ func_mode_link ()
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
test " " = "$libobjs" && libobjs=
@@ -8120,7 +8118,7 @@ EOF
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then