mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-02-11 15:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

libtool: use false or : for $preload, and simplify

Browse Source 
* build-aux/ltmain.m4sh (func_mode_link): Save a string
comparison by setting $preload to false or : and using it directly
instead of if statements.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
Gary V. Vaughan 2012-10-02 18:08:29 +07:00
parent 4e05284e51
commit fd1151fe85
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build-aux/ltmain.m4sh
View File

@ -4388,7 +4388,7 @@ func_mode_link ()
non_pic_objects= non_pic_objects=
precious_files_regex= precious_files_regex=
prefer_static_libs=no prefer_static_libs=no
preload=no preload=false
prev= prev=
prevarg= prevarg=
release= release=
@ -4471,12 +4471,12 @@ func_mode_link ()
continue continue
;; ;;
dlfiles|dlprefiles) dlfiles|dlprefiles)
if test no = "$preload"; then $preload || {
# Add the symbol object into the linking commands. # Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@" func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@" func_append finalize_command " @SYMFILE@"
preload=yes preload=:
fi }
case $arg in case $arg in
*.la | *.lo) ;; # We handle these cases below. *.la | *.lo) ;; # We handle these cases below.
force) force)
@ -7949,7 +7949,7 @@ EOF
test -n "$release" && \ test -n "$release" && \
func_warning "\`-release' is ignored for programs" func_warning "\`-release' is ignored for programs"
test yes = "$preload" \ $preload \
&& test unknown = "$dlopen_support" \ && test unknown = "$dlopen_support" \
&& test unknown = "$dlopen_self" \ && test unknown = "$dlopen_self" \
&& test unknown = "$dlopen_self_static" \ && test unknown = "$dlopen_self_static" \
@ -8344,9 +8344,8 @@ EOF
build_libtool_libs=no build_libtool_libs=no
else else
oldobjs="$old_deplibs $non_pic_objects" oldobjs="$old_deplibs $non_pic_objects"
if test yes = "$preload" && test -f "$symfileobj"; then $preload && test -f "$symfileobj" \
func_append oldobjs " $symfileobj" && func_append oldobjs " $symfileobj"
fi
fi fi
addlibs=$old_convenience addlibs=$old_convenience
fi fi