ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-22 19:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

autotools: a few libtool updates from mainstream

Browse source 
(cherry picked from commit 971508c0d770f564353c7976c8b1df895d2b0dcc)
This commit is contained in:
Ozkan Sezer 2024-01-28 20:04:34 +03:00
parent 4a62e1c0ca
commit 23cf7a2e0d
4 changed files with 172 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
acinclude/libtool.m4 vendored
View file

@ -219,8 +219,8 @@ esac
ofile=libtool ofile=libtool
can_build_shared=yes can_build_shared=yes
# All known linkers require a '.a' archive for static linking (except MSVC, # All known linkers require a '.a' archive for static linking (except MSVC and
# which needs '.lib'). # ICC, which need '.lib').
libext=a libext=a
with_gnu_ld=$lt_cv_prog_gnu_ld with_gnu_ld=$lt_cv_prog_gnu_ld
@ -1365,7 +1365,7 @@ mips64*-*linux*)
;; ;;
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*) s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
# Find out what ABI is being produced by ac_compile, and set linker # Find out what ABI is being produced by ac_compile, and set linker
# options accordingly. Note that the listed cases only cover the # options accordingly. Note that the listed cases only cover the
# situations where additional linker options are needed (such as when # situations where additional linker options are needed (such as when
@ -1380,7 +1380,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*kfreebsd*-gnu) x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_i386_fbsd" LD="${LD-ld} -m elf_i386_fbsd"
;; ;;
x86_64-*linux*) x86_64-*linux*|x86_64-gnu*)
case `/usr/bin/file conftest.o` in case `/usr/bin/file conftest.o` in
*x86-64*) *x86-64*)
LD="${LD-ld} -m elf32_x86_64" LD="${LD-ld} -m elf32_x86_64"
@ -1409,7 +1409,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*kfreebsd*-gnu) x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd" LD="${LD-ld} -m elf_x86_64_fbsd"
;; ;;
x86_64-*linux*) x86_64-*linux*|x86_64-gnu*)
LD="${LD-ld} -m elf_x86_64" LD="${LD-ld} -m elf_x86_64"
;; ;;
powerpcle-*linux*|powerpc64le-*linux*) powerpcle-*linux*|powerpc64le-*linux*)
@ -1540,15 +1540,8 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds= old_postuninstall_cmds=
if test -n "$RANLIB"; then if test -n "$RANLIB"; then
case $host_os in
bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
fi fi
case $host_os in case $host_os in
@ -1687,7 +1680,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=-1; lt_cv_sys_max_cmd_len=-1;
;; ;;
cygwin* | mingw* | cegcc*) cygwin* | mingw* | windows* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes # On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially. # about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking, # Worse, since 9x/ME are not pre-emptively multitasking,
@ -1930,7 +1923,7 @@ else
lt_cv_dlopen_self=yes lt_cv_dlopen_self=yes
;; ;;
mingw* | pw32* | cegcc*) mingw* | windows* | pw32* | cegcc*)
lt_cv_dlopen=LoadLibrary lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs= lt_cv_dlopen_libs=
;; ;;
@ -2298,7 +2291,7 @@ if test yes = "$GCC"; then
*) lt_awk_arg='/^libraries:/' ;; *) lt_awk_arg='/^libraries:/' ;;
esac esac
case $host_os in case $host_os in
mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
*) lt_sed_strip_eq='s|=/|/|g' ;; *) lt_sed_strip_eq='s|=/|/|g' ;;
esac esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
@ -2356,7 +2349,7 @@ BEGIN {RS = " "; FS = "/|\n";} {
# AWK program above erroneously prepends '/' to C:/dos/paths # AWK program above erroneously prepends '/' to C:/dos/paths
# for these hosts. # for these hosts.
case $host_os in case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
$SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
@ -2525,7 +2518,7 @@ bsdi[[45]]*)
# libtool to hard-code these into programs # libtool to hard-code these into programs
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
version_type=windows version_type=windows
shrext_cmds=.dll shrext_cmds=.dll
need_version=no need_version=no
@ -2558,7 +2551,7 @@ cygwin* | mingw* | pw32* | cegcc*)
m4_if([$1], [],[ m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;; ;;
mingw* | cegcc*) mingw* | windows* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix # MinGW DLLs use traditional 'lib' prefix
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' #soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
@ -2571,14 +2564,14 @@ m4_if([$1], [],[
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
;; ;;
*,cl*) *,cl* | *,icl*)
# Native MSVC # Native MSVC or ICC
libname_spec='$name' libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib' library_names_spec='$libname.dll.lib'
case $build_os in case $build_os in
mingw*) mingw* | windows*)
sys_lib_search_path_spec= sys_lib_search_path_spec=
lt_save_ifs=$IFS lt_save_ifs=$IFS
IFS=';' IFS=';'
@ -2628,7 +2621,7 @@ m4_if([$1], [],[
;; ;;
*) *)
# Assume MSVC wrapper # Assume MSVC and ICC wrapper
library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
;; ;;
@ -3267,7 +3260,7 @@ if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path. # Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC]) AC_MSG_CHECKING([for ld used by $CC])
case $host in case $host in
*-*-mingw*) *-*-mingw* | *-*-windows*)
# gcc leaves a trailing carriage return, which upsets mingw # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*) *)
@ -3376,7 +3369,7 @@ case $reload_flag in
esac esac
reload_cmds='$LD$reload_flag -o $output$reload_objs' reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
if test yes != "$GCC"; then if test yes != "$GCC"; then
reload_cmds=false reload_cmds=false
fi fi
@ -3476,7 +3469,7 @@ cygwin*)
lt_cv_deplibs_check_method=pass_all # SDL customization lt_cv_deplibs_check_method=pass_all # SDL customization
;; ;;
mingw* | pw32*) mingw* | windows* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by # Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump', # func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling. # unless we find 'file', for example because we are cross-compiling.
@ -3641,7 +3634,7 @@ file_magic_glob=
want_nocaseglob=no want_nocaseglob=no
if test "$build" = "$host"; then if test "$build" = "$host"; then
case $host_os in case $host_os in
mingw* | pw32*) mingw* | windows* | pw32*)
if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
want_nocaseglob=yes want_nocaseglob=yes
else else
@ -3693,7 +3686,7 @@ else
# Tru64's nm complains that /dev/null is an invalid object file # Tru64's nm complains that /dev/null is an invalid object file
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
case $build_os in case $build_os in
mingw*) lt_bad_file=conftest.nm/nofile ;; mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
*) lt_bad_file=/dev/null ;; *) lt_bad_file=/dev/null ;;
esac esac
case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
@ -3784,7 +3777,7 @@ lt_cv_sharedlib_from_linklib_cmd,
[lt_cv_sharedlib_from_linklib_cmd='unknown' [lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh; # two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in case `$DLLTOOL --help 2>&1` in
@ -3929,7 +3922,7 @@ case $host_os in
aix*) aix*)
symcode='[[BCDT]]' symcode='[[BCDT]]'
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]' symcode='[[ABCDGISTW]]'
;; ;;
hpux*) hpux*)
@ -4008,7 +4001,7 @@ $lt_c_name_lib_hook\
# Handle CRLF in mingw tool chain # Handle CRLF in mingw tool chain
opt_cr= opt_cr=
case $build_os in case $build_os in
mingw*) mingw* | windows*)
opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
;; ;;
esac esac
@ -4023,7 +4016,7 @@ for ac_symprfx in "" "_"; do
if test "$lt_cv_nm_interface" = "MS dumpbin"; then if test "$lt_cv_nm_interface" = "MS dumpbin"; then
# Fake it for dumpbin and say T for any non-static function, # Fake it for dumpbin and say T for any non-static function,
# D for any global variable and I for any imported variable. # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++, # Also find C++ and __fastcall symbols from MSVC++ or ICC,
# which start with @ or ?. # which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\ lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\ " {last_section=section; section=\$ 3};"\
@ -4235,7 +4228,7 @@ m4_if([$1], [CXX], [
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
mingw* | cygwin* | os2* | pw32* | cegcc*) mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style # Although the cygwin gcc ignores -fPIC, still need this for old-style
@ -4311,7 +4304,7 @@ m4_if([$1], [CXX], [
;; ;;
esac esac
;; ;;
mingw* | cygwin* | os2* | pw32* | cegcc*) mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [], m4_if([$1], [GCJ], [],
@ -4559,7 +4552,7 @@ m4_if([$1], [CXX], [
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
mingw* | cygwin* | pw32* | os2* | cegcc*) mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style # Although the cygwin gcc ignores -fPIC, still need this for old-style
@ -4663,7 +4656,7 @@ m4_if([$1], [CXX], [
esac esac
;; ;;
mingw* | cygwin* | pw32* | os2* | cegcc*) mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [], m4_if([$1], [GCJ], [],
@ -4938,9 +4931,9 @@ m4_if([$1], [CXX], [
pw32*) pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;; ;;
cygwin* | mingw* | cegcc*) cygwin* | mingw* | windows* | cegcc*)
case $cc_basename in case $cc_basename in
cl*) cl* | icl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
;; ;;
*) *)
@ -4996,16 +4989,16 @@ dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds= extract_expsyms_cmds=
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using # When not using gcc, we currently assume that we are using
# Microsoft Visual C++. # Microsoft Visual C++ or Intel C++ Compiler.
if test yes != "$GCC"; then if test yes != "$GCC"; then
with_gnu_ld=no with_gnu_ld=no
fi fi
;; ;;
interix*) interix*)
# we just hope/assume this is gcc and not c89 (= MSVC++) # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
with_gnu_ld=yes with_gnu_ld=yes
;; ;;
openbsd* | bitrig*) openbsd* | bitrig*)
@ -5111,7 +5104,7 @@ _LT_EOF
fi fi
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs. # as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@ -5568,14 +5561,14 @@ _LT_EOF
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using # When not using gcc, we currently assume that we are using
# Microsoft Visual C++. # Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is # hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs. # no search path for DLLs.
case $cc_basename in case $cc_basename in
cl*) cl* | icl*)
# Native MSVC # Native MSVC or ICC
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=yes _LT_TAGVAR(always_export_symbols, $1)=yes
@ -5585,14 +5578,14 @@ _LT_EOF
# Tell ltmain to make .dll files, not .so files. # Tell ltmain to make .dll files, not .so files.
shrext_cmds=.dll shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack. # FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' _LT_TAGVAR(archive_cmds, $1)='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
cp "$export_symbols" "$output_objdir/$soname.def"; cp "$export_symbols" "$output_objdir/$soname.def";
echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
else else
$SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
fi~ fi~
$CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
linknames=' linknames='
# The linker will not automatically build a static lib if we build a DLL. # The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@ -5616,7 +5609,7 @@ _LT_EOF
fi' fi'
;; ;;
*) *)
# Assume MSVC wrapper # Assume MSVC and ICC wrapper
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Tell ltmain to make .lib files, not .a files. # Tell ltmain to make .lib files, not .a files.
@ -6435,7 +6428,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"'
else else
GXX=no GXX=no
@ -6644,10 +6637,10 @@ if test yes != "$_lt_caught_CXX_error"; then
esac esac
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
case $GXX,$cc_basename in case $GXX,$cc_basename in
,cl* | no,cl*) ,cl* | no,cl* | ,icl* | no,icl*)
# Native MSVC # Native MSVC or ICC
# hardcode_libdir_flag_spec is actually meaningless, as there is # hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs. # no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@ -6811,7 +6804,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# explicitly linking system object files so we need to strip them # explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library # from the output so that they don't get included in the library
# dependencies. # dependencies.
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "[[-]]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;; ;;
*) *)
if test yes = "$GXX"; then if test yes = "$GXX"; then
@ -6876,7 +6869,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# explicitly linking system object files so we need to strip them # explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library # from the output so that they don't get included in the library
# dependencies. # dependencies.
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "[[-]]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;; ;;
*) *)
if test yes = "$GXX"; then if test yes = "$GXX"; then
@ -7215,7 +7208,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"'
else else
# FIXME: insert proper C++ library support # FIXME: insert proper C++ library support
@ -7299,7 +7292,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"'
else else
# g++ 2.7 appears to require '-G' NOT '-shared' on this # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform. # platform.
@ -7310,7 +7303,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"'
fi fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
@ -8331,7 +8324,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
[case $host in [case $host in
*-*-mingw* ) *-*-mingw* )
case $build in case $build in
*-*-mingw* ) # actually msys *-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;; ;;
*-*-cygwin* ) *-*-cygwin* )
@ -8344,7 +8337,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
;; ;;
*-*-cygwin* ) *-*-cygwin* )
case $build in case $build in
*-*-mingw* ) # actually msys *-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;; ;;
*-*-cygwin* ) *-*-cygwin* )
@ -8370,9 +8363,9 @@ AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
[#assume ordinary cross tools, or native build. [#assume ordinary cross tools, or native build.
lt_cv_to_tool_file_cmd=func_convert_file_noop lt_cv_to_tool_file_cmd=func_convert_file_noop
case $host in case $host in
*-*-mingw* ) *-*-mingw* | *-*-windows* )
case $build in case $build in
*-*-mingw* ) # actually msys *-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
;; ;;
esac esac

2
acinclude/ltoptions.m4 vendored
View file

@ -128,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes [enable_win32_dll=yes
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false) AC_CHECK_TOOL(OBJDUMP, objdump, false)

88
build-scripts/ltmain.sh
View file

@ -2418,7 +2418,7 @@ libtool_validate_options ()
case $host in case $host in
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
*cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) *cygwin* | *mingw* | *windows* | *pw32* | *cegcc* | *solaris2* | *os2*)
# don't eliminate duplications in $postdeps and $predeps # don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=: opt_duplicate_compiler_generated_deps=:
;; ;;
@ -2750,7 +2750,7 @@ EOF
# func_convert_core_file_wine_to_w32 ARG # func_convert_core_file_wine_to_w32 ARG
# Helper function used by file name conversion functions when $build is *nix, # Helper function used by file name conversion functions when $build is *nix,
# and $host is mingw, cygwin, or some other w32 environment. Relies on a # and $host is mingw, windows, cygwin, or some other w32 environment. Relies on a
# correctly configured wine environment available, with the winepath program # correctly configured wine environment available, with the winepath program
# in $build's $PATH. # in $build's $PATH.
# #
@ -2782,9 +2782,10 @@ func_convert_core_file_wine_to_w32 ()
# func_convert_core_path_wine_to_w32 ARG # func_convert_core_path_wine_to_w32 ARG
# Helper function used by path conversion functions when $build is *nix, and # Helper function used by path conversion functions when $build is *nix, and
# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly # $host is mingw, windows, cygwin, or some other w32 environment. Relies on a
# configured wine environment available, with the winepath program in $build's # correctly configured wine environment available, with the winepath program
# $PATH. Assumes ARG has no leading or trailing path separator characters. # in $build's $PATH. Assumes ARG has no leading or trailing path separator
# characters.
# #
# ARG is path to be converted from $build format to win32. # ARG is path to be converted from $build format to win32.
# Result is available in $func_convert_core_path_wine_to_w32_result. # Result is available in $func_convert_core_path_wine_to_w32_result.
@ -3439,7 +3440,7 @@ func_mode_compile ()
# On Cygwin there's no "real" PIC flag so we must build both object types # On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | os2* | cegcc*) cygwin* | mingw* | windows* | pw32* | os2* | cegcc*)
pic_mode=default pic_mode=default
;; ;;
esac esac
@ -4316,7 +4317,7 @@ func_mode_install ()
'exit $?' 'exit $?'
tstripme=$stripme tstripme=$stripme
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
case $realname in case $realname in
*.dll.a) *.dll.a)
tstripme= tstripme=
@ -4429,7 +4430,7 @@ func_mode_install ()
# Do a test to see if this is really a libtool program. # Do a test to see if this is really a libtool program.
case $host in case $host in
*cygwin* | *mingw*) *cygwin* | *mingw* | *windows*)
if func_ltwrapper_executable_p "$file"; then if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file" func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result wrapper=$func_ltwrapper_scriptname_result
@ -4657,7 +4658,7 @@ extern \"C\" {
$RM $export_symbols $RM $export_symbols
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in case $host in
*cygwin* | *mingw* | *cegcc* ) *cygwin* | *mingw* | *windows* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;; ;;
@ -4669,7 +4670,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"' eval '$MV "$nlist"T "$nlist"'
case $host in case $host in
*cygwin* | *mingw* | *cegcc* ) *cygwin* | *mingw* | *windows* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;; ;;
@ -4683,7 +4684,7 @@ extern \"C\" {
func_basename "$dlprefile" func_basename "$dlprefile"
name=$func_basename_result name=$func_basename_result
case $host in case $host in
*cygwin* | *mingw* | *cegcc* ) *cygwin* | *mingw* | *windows* | *cegcc* )
# if an import library, we need to obtain dlname # if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile" func_tr_sh "$dlprefile"
@ -4858,7 +4859,7 @@ static const void *lt_preloaded_setup() {
# Transform the symbol file into the correct name. # Transform the symbol file into the correct name.
symfileobj=$output_objdir/${my_outputname}S.$objext symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in case $host in
*cygwin* | *mingw* | *cegcc* ) *cygwin* | *mingw* | *windows* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then if test -f "$output_objdir/$my_outputname.def"; then
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@ -5201,7 +5202,7 @@ func_extract_archives ()
# #
# Emit a libtool wrapper script on stdout. # Emit a libtool wrapper script on stdout.
# Don't directly open a file because we may want to # Don't directly open a file because we may want to
# incorporate the script contents within a cygwin/mingw # incorporate the script contents within a cygwin/mingw/windows
# wrapper executable. Must ONLY be called from within # wrapper executable. Must ONLY be called from within
# func_mode_link because it depends on a number of variables # func_mode_link because it depends on a number of variables
# set therein. # set therein.
@ -5209,7 +5210,7 @@ func_extract_archives ()
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script # variable will take. If 'yes', then the emitted script
# will assume that the directory where it is stored is # will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific # the $objdir directory. This is a cygwin/mingw/windows-specific
# behavior. # behavior.
func_emit_wrapper () func_emit_wrapper ()
{ {
@ -5333,7 +5334,7 @@ func_exec_program_core ()
" "
case $host in case $host in
# Backslashes separate directories on plain windows # Backslashes separate directories on plain windows
*-*-mingw | *-*-os2* | *-cegcc*) *-*-mingw* | *-*-windows* | *-*-os2* | *-cegcc*)
$ECHO "\ $ECHO "\
if test -n \"\$lt_option_debug\"; then if test -n \"\$lt_option_debug\"; then
\$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
@ -5401,7 +5402,7 @@ func_exec_program ()
file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done done
# Usually 'no', except on cygwin/mingw when embedded into # Usually 'no', except on cygwin/mingw/windows when embedded into
# the cwrapper. # the cwrapper.
WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
@ -5558,7 +5559,7 @@ EOF
/* declarations of non-ANSI functions */ /* declarations of non-ANSI functions */
#if defined __MINGW32__ #if defined __MINGW32__
# ifdef __STRICT_ANSI__ # ifdef __STRICT_ANSI__
int _putenv (const char *); _CRTIMP int __cdecl _putenv (const char *);
# endif # endif
#elif defined __CYGWIN__ #elif defined __CYGWIN__
# ifdef __STRICT_ANSI__ # ifdef __STRICT_ANSI__
@ -5756,7 +5757,7 @@ main (int argc, char *argv[])
{ {
EOF EOF
case $host in case $host in
*mingw* | *cygwin* ) *mingw* | *windows* | *cygwin* )
# make stdout use "unix" line endings # make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);" echo " setmode(1,_O_BINARY);"
;; ;;
@ -5859,7 +5860,7 @@ EOF
EOF EOF
case $host_os in case $host_os in
mingw*) mingw* | windows*)
cat <<"EOF" cat <<"EOF"
{ {
char* p; char* p;
@ -5901,7 +5902,7 @@ EOF
EOF EOF
case $host_os in case $host_os in
mingw*) mingw* | windows*)
cat <<"EOF" cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */ /* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz); newargz = prepare_spawn (newargz);
@ -6320,7 +6321,7 @@ lt_update_lib_path (const char *name, const char *value)
EOF EOF
case $host_os in case $host_os in
mingw*) mingw* | windows*)
cat <<"EOF" cat <<"EOF"
/* Prepares an argument vector before calling spawn(). /* Prepares an argument vector before calling spawn().
@ -6495,7 +6496,7 @@ func_mode_link ()
$debug_cmd $debug_cmd
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and # It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out # we shouldn't force the makefile maintainer to figure out
# what system we are compiling for in order to pass an extra # what system we are compiling for in order to pass an extra
@ -7003,7 +7004,7 @@ func_mode_link ()
;; ;;
esac esac
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in case :$dllsearchpath: in
*":$dir:"*) ;; *":$dir:"*) ;;
@ -7023,7 +7024,7 @@ func_mode_link ()
-l*) -l*)
if test X-lc = "X$arg" || test X-lm = "X$arg"; then if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such) # These systems don't actually have a C or math library (as such)
continue continue
;; ;;
@ -7118,7 +7119,7 @@ func_mode_link ()
-no-install) -no-install)
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows # The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs. # and Darwin in order for the loader to find any dlls it needs.
func_warning "'-no-install' is ignored for $host" func_warning "'-no-install' is ignored for $host"
@ -7303,13 +7304,26 @@ func_mode_link ()
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files # -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang # -stdlib=* select c++ std lib with clang
# -fdiagnostics-color* simply affects output
# -frecord-gcc-switches used to verify flags were respected
# -fsanitize=* Clang/GCC memory and address sanitizer # -fsanitize=* Clang/GCC memory and address sanitizer
# -fno-sanitize* Clang/GCC memory and address sanitizer
# -shared-libsan Link with shared sanitizer runtimes (Clang)
# -static-libsan Link with static sanitizer runtimes (Clang)
# -fuse-ld=* Linker select flags for GCC # -fuse-ld=* Linker select flags for GCC
# -rtlib=* select c runtime lib with clang
# --unwindlib=* select unwinder library with clang
# -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
# -Wa,* Pass flags directly to the assembler # -Wa,* Pass flags directly to the assembler
# -Werror, -Werror=* Report (specified) warnings as errors
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*| \
-specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) -stdlib=*|-rtlib=*|--unwindlib=*| \
-specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
-fdiagnostics-color*|-frecord-gcc-switches| \
-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
func_quote_for_eval "$arg" func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result arg=$func_quote_for_eval_result
func_append compile_command " $arg" func_append compile_command " $arg"
@ -8022,7 +8036,7 @@ func_mode_link ()
fi fi
case $host in case $host in
# special handling for platforms with PE-DLLs. # special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* ) *cygwin* | *mingw* | *windows* | *cegcc* )
# Linker will automatically link against shared library if both # Linker will automatically link against shared library if both
# static and shared are present. Therefore, ensure we extract # static and shared are present. Therefore, ensure we extract
# symbols from the import library if a shared library is present # symbols from the import library if a shared library is present
@ -8166,7 +8180,7 @@ func_mode_link ()
if test -n "$library_names" && if test -n "$library_names" &&
{ test no = "$use_static_libs" || test -z "$old_library"; }; then { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in case $host in
*cygwin* | *mingw* | *cegcc* | *os2*) *cygwin* | *mingw* | *windows* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded # No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib" func_append notinst_deplibs " $lib"
need_relink=no need_relink=no
@ -8236,7 +8250,7 @@ func_mode_link ()
elif test -n "$soname_spec"; then elif test -n "$soname_spec"; then
# bleh windows # bleh windows
case $host in case $host in
*cygwin* | mingw* | *cegcc*) # | *os2* # SDL customization: removed OS/2 versioning support. *cygwin* | mingw* | *windows* | *cegcc*) # | *os2* # SDL customization: removed OS/2 versioning support.
func_arith $current - $age func_arith $current - $age
major=$func_arith_result major=$func_arith_result
versuffix=-$major versuffix=-$major
@ -8845,7 +8859,7 @@ func_mode_link ()
age=$number_minor age=$number_minor
revision=$number_revision revision=$number_revision
;; ;;
freebsd-aout|qnx|sunos) freebsd-aout|qnx|sco|sunos)
current=$number_major current=$number_major
revision=$number_minor revision=$number_minor
age=0 age=0
@ -9146,7 +9160,7 @@ func_mode_link ()
if test yes = "$build_libtool_libs"; then if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then if test -n "$rpath"; then
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
*-*-rhapsody* | *-*-darwin1.[012]) *-*-rhapsody* | *-*-darwin1.[012])
@ -9660,7 +9674,7 @@ EOF
orig_export_symbols= orig_export_symbols=
case $host_os in case $host_os in
cygwin* | mingw* | cegcc*) cygwin* | mingw* | windows* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile # exporting using user supplied symfile
func_dll_def_p "$export_symbols" || { func_dll_def_p "$export_symbols" || {
@ -10330,7 +10344,7 @@ EOF
esac esac
fi fi
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in case :$dllsearchpath: in
*":$libdir:"*) ;; *":$libdir:"*) ;;
@ -10408,7 +10422,7 @@ EOF
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=false wrappers_required=false
;; ;;
*cygwin* | *mingw* ) *cygwin* | *mingw* | *windows* )
test yes = "$build_libtool_libs" || wrappers_required=false test yes = "$build_libtool_libs" || wrappers_required=false
;; ;;
*) *)
@ -10561,7 +10575,7 @@ EOF
*) exeext= ;; *) exeext= ;;
esac esac
case $host in case $host in
*cygwin* | *mingw* ) *cygwin* | *mingw* | windows* )
func_dirname_and_basename "$output" "" "." func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result output_name=$func_basename_result
output_path=$func_dirname_result output_path=$func_dirname_result
@ -10893,7 +10907,7 @@ EOF
# tests/bindir.at for full details. # tests/bindir.at for full details.
tdlname=$dlname tdlname=$dlname
case $host,$output,$installed,$module,$dlname in case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there. # If a -bindir argument was supplied, place the dll there.
if test -n "$bindir"; then if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir" func_relative_path "$install_libdir" "$bindir"

135
configure vendored
View file

@ -5035,7 +5035,7 @@ if test yes = "$GCC"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
printf %s "checking for ld used by $CC... " >&6; } printf %s "checking for ld used by $CC... " >&6; }
case $host in case $host in
*-*-mingw*) *-*-mingw* | *-*-windows*)
# gcc leaves a trailing carriage return, which upsets mingw # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*) *)
@ -5162,7 +5162,7 @@ else
# Tru64's nm complains that /dev/null is an invalid object file # Tru64's nm complains that /dev/null is an invalid object file
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
case $build_os in case $build_os in
mingw*) lt_bad_file=conftest.nm/nofile ;; mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
*) lt_bad_file=/dev/null ;; *) lt_bad_file=/dev/null ;;
esac esac
case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
@ -5391,7 +5391,7 @@ else $as_nop
lt_cv_sys_max_cmd_len=-1; lt_cv_sys_max_cmd_len=-1;
;; ;;
cygwin* | mingw* | cegcc*) cygwin* | mingw* | windows* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes # On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially. # about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking, # Worse, since 9x/ME are not pre-emptively multitasking,
@ -5555,7 +5555,7 @@ else $as_nop
case $host in case $host in
*-*-mingw* ) *-*-mingw* )
case $build in case $build in
*-*-mingw* ) # actually msys *-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;; ;;
*-*-cygwin* ) *-*-cygwin* )
@ -5568,7 +5568,7 @@ else $as_nop
;; ;;
*-*-cygwin* ) *-*-cygwin* )
case $build in case $build in
*-*-mingw* ) # actually msys *-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;; ;;
*-*-cygwin* ) *-*-cygwin* )
@ -5603,9 +5603,9 @@ else $as_nop
#assume ordinary cross tools, or native build. #assume ordinary cross tools, or native build.
lt_cv_to_tool_file_cmd=func_convert_file_noop lt_cv_to_tool_file_cmd=func_convert_file_noop
case $host in case $host in
*-*-mingw* ) *-*-mingw* | *-*-windows* )
case $build in case $build in
*-*-mingw* ) # actually msys *-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
;; ;;
esac esac
@ -5639,7 +5639,7 @@ case $reload_flag in
esac esac
reload_cmds='$LD$reload_flag -o $output$reload_objs' reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
if test yes != "$GCC"; then if test yes != "$GCC"; then
reload_cmds=false reload_cmds=false
fi fi
@ -5812,7 +5812,7 @@ cygwin*)
lt_cv_deplibs_check_method=pass_all # SDL customization lt_cv_deplibs_check_method=pass_all # SDL customization
;; ;;
mingw* | pw32*) mingw* | windows* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by # Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump', # func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling. # unless we find 'file', for example because we are cross-compiling.
@ -5980,7 +5980,7 @@ file_magic_glob=
want_nocaseglob=no want_nocaseglob=no
if test "$build" = "$host"; then if test "$build" = "$host"; then
case $host_os in case $host_os in
mingw* | pw32*) mingw* | windows* | pw32*)
if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
want_nocaseglob=yes want_nocaseglob=yes
else else
@ -6134,7 +6134,7 @@ else $as_nop
lt_cv_sharedlib_from_linklib_cmd='unknown' lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh; # two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in case `$DLLTOOL --help 2>&1` in
@ -6572,15 +6572,8 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds= old_postuninstall_cmds=
if test -n "$RANLIB"; then if test -n "$RANLIB"; then
case $host_os in
bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
fi fi
case $host_os in case $host_os in
@ -6707,7 +6700,7 @@ case $host_os in
aix*) aix*)
symcode='[BCDT]' symcode='[BCDT]'
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
symcode='[ABCDGISTW]' symcode='[ABCDGISTW]'
;; ;;
hpux*) hpux*)
@ -6786,7 +6779,7 @@ $lt_c_name_lib_hook\
# Handle CRLF in mingw tool chain # Handle CRLF in mingw tool chain
opt_cr= opt_cr=
case $build_os in case $build_os in
mingw*) mingw* | windows*)
opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
;; ;;
esac esac
@ -6801,7 +6794,7 @@ for ac_symprfx in "" "_"; do
if test "$lt_cv_nm_interface" = "MS dumpbin"; then if test "$lt_cv_nm_interface" = "MS dumpbin"; then
# Fake it for dumpbin and say T for any non-static function, # Fake it for dumpbin and say T for any non-static function,
# D for any global variable and I for any imported variable. # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++, # Also find C++ and __fastcall symbols from MSVC++ or ICC,
# which start with @ or ?. # which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\ lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\ " {last_section=section; section=\$ 3};"\
@ -7235,7 +7228,7 @@ mips64*-*linux*)
;; ;;
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*) s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
# Find out what ABI is being produced by ac_compile, and set linker # Find out what ABI is being produced by ac_compile, and set linker
# options accordingly. Note that the listed cases only cover the # options accordingly. Note that the listed cases only cover the
# situations where additional linker options are needed (such as when # situations where additional linker options are needed (such as when
@ -7254,7 +7247,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*kfreebsd*-gnu) x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_i386_fbsd" LD="${LD-ld} -m elf_i386_fbsd"
;; ;;
x86_64-*linux*) x86_64-*linux*|x86_64-gnu*)
case `/usr/bin/file conftest.o` in case `/usr/bin/file conftest.o` in
*x86-64*) *x86-64*)
LD="${LD-ld} -m elf32_x86_64" LD="${LD-ld} -m elf32_x86_64"
@ -7283,7 +7276,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*kfreebsd*-gnu) x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd" LD="${LD-ld} -m elf_x86_64_fbsd"
;; ;;
x86_64-*linux*) x86_64-*linux*|x86_64-gnu*)
LD="${LD-ld} -m elf_x86_64" LD="${LD-ld} -m elf_x86_64"
;; ;;
powerpcle-*linux*|powerpc64le-*linux*) powerpcle-*linux*|powerpc64le-*linux*)
@ -8279,7 +8272,7 @@ fi
enable_win32_dll=yes enable_win32_dll=yes
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2 set dummy ${ac_tool_prefix}as; ac_word=$2
@ -8895,8 +8888,8 @@ esac
ofile=libtool ofile=libtool
can_build_shared=yes can_build_shared=yes
# All known linkers require a '.a' archive for static linking (except MSVC, # All known linkers require a '.a' archive for static linking (except MSVC and
# which needs '.lib'). # ICC, which need '.lib').
libext=a libext=a
with_gnu_ld=$lt_cv_prog_gnu_ld with_gnu_ld=$lt_cv_prog_gnu_ld
@ -9220,7 +9213,7 @@ lt_prog_compiler_static=
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
mingw* | cygwin* | pw32* | os2* | cegcc*) mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style # Although the cygwin gcc ignores -fPIC, still need this for old-style
@ -9323,7 +9316,7 @@ lt_prog_compiler_static=
esac esac
;; ;;
mingw* | cygwin* | pw32* | os2* | cegcc*) mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT' lt_prog_compiler_pic='-DDLL_EXPORT'
@ -9830,16 +9823,16 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
extract_expsyms_cmds= extract_expsyms_cmds=
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using # When not using gcc, we currently assume that we are using
# Microsoft Visual C++. # Microsoft Visual C++ or Intel C++ Compiler.
if test yes != "$GCC"; then if test yes != "$GCC"; then
with_gnu_ld=no with_gnu_ld=no
fi fi
;; ;;
interix*) interix*)
# we just hope/assume this is gcc and not c89 (= MSVC++) # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
with_gnu_ld=yes with_gnu_ld=yes
;; ;;
openbsd* | bitrig*) openbsd* | bitrig*)
@ -9945,7 +9938,7 @@ _LT_EOF
fi fi
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs. # as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_flag_spec='-L$libdir'
@ -10490,14 +10483,14 @@ fi
export_dynamic_flag_spec=-rdynamic export_dynamic_flag_spec=-rdynamic
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using # When not using gcc, we currently assume that we are using
# Microsoft Visual C++. # Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is # hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs. # no search path for DLLs.
case $cc_basename in case $cc_basename in
cl*) cl* | icl*)
# Native MSVC # Native MSVC or ICC
hardcode_libdir_flag_spec=' ' hardcode_libdir_flag_spec=' '
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
always_export_symbols=yes always_export_symbols=yes
@ -10507,14 +10500,14 @@ fi
# Tell ltmain to make .dll files, not .so files. # Tell ltmain to make .dll files, not .so files.
shrext_cmds=.dll shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack. # FIXME: Setting linknames here is a bad hack.
archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' archive_cmds='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
cp "$export_symbols" "$output_objdir/$soname.def"; cp "$export_symbols" "$output_objdir/$soname.def";
echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
else else
$SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
fi~ fi~
$CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
linknames=' linknames='
# The linker will not automatically build a static lib if we build a DLL. # The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true' # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@ -10538,7 +10531,7 @@ fi
fi' fi'
;; ;;
*) *)
# Assume MSVC wrapper # Assume MSVC and ICC wrapper
hardcode_libdir_flag_spec=' ' hardcode_libdir_flag_spec=' '
allow_undefined_flag=unsupported allow_undefined_flag=unsupported
# Tell ltmain to make .lib files, not .a files. # Tell ltmain to make .lib files, not .a files.
@ -11304,7 +11297,7 @@ if test yes = "$GCC"; then
*) lt_awk_arg='/^libraries:/' ;; *) lt_awk_arg='/^libraries:/' ;;
esac esac
case $host_os in case $host_os in
mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
*) lt_sed_strip_eq='s|=/|/|g' ;; *) lt_sed_strip_eq='s|=/|/|g' ;;
esac esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
@ -11362,7 +11355,7 @@ BEGIN {RS = " "; FS = "/|\n";} {
# AWK program above erroneously prepends '/' to C:/dos/paths # AWK program above erroneously prepends '/' to C:/dos/paths
# for these hosts. # for these hosts.
case $host_os in case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
$SED 's|/\([A-Za-z]:\)|\1|g'` ;; $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
@ -11530,7 +11523,7 @@ bsdi[45]*)
# libtool to hard-code these into programs # libtool to hard-code these into programs
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
version_type=windows version_type=windows
shrext_cmds=.dll shrext_cmds=.dll
need_version=no need_version=no
@ -11563,7 +11556,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;; ;;
mingw* | cegcc*) mingw* | windows* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix # MinGW DLLs use traditional 'lib' prefix
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' #soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
@ -11576,14 +11569,14 @@ cygwin* | mingw* | pw32* | cegcc*)
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
;; ;;
*,cl*) *,cl* | *,icl*)
# Native MSVC # Native MSVC or ICC
libname_spec='$name' libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib' library_names_spec='$libname.dll.lib'
case $build_os in case $build_os in
mingw*) mingw* | windows*)
sys_lib_search_path_spec= sys_lib_search_path_spec=
lt_save_ifs=$IFS lt_save_ifs=$IFS
IFS=';' IFS=';'
@ -11633,7 +11626,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;; ;;
*) *)
# Assume MSVC wrapper # Assume MSVC and ICC wrapper
library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
;; ;;
@ -12303,7 +12296,7 @@ else
lt_cv_dlopen_self=yes lt_cv_dlopen_self=yes
;; ;;
mingw* | pw32* | cegcc*) mingw* | windows* | pw32* | cegcc*)
lt_cv_dlopen=LoadLibrary lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs= lt_cv_dlopen_libs=
;; ;;
@ -14579,7 +14572,7 @@ if test yes = "$GCC"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
printf %s "checking for ld used by $CC... " >&6; } printf %s "checking for ld used by $CC... " >&6; }
case $host in case $host in
*-*-mingw*) *-*-mingw* | *-*-windows*)
# gcc leaves a trailing carriage return, which upsets mingw # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*) *)
@ -14713,7 +14706,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[-]L"'
else else
GXX=no GXX=no
@ -15011,10 +15004,10 @@ fi
esac esac
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
case $GXX,$cc_basename in case $GXX,$cc_basename in
,cl* | no,cl*) ,cl* | no,cl* | ,icl* | no,icl*)
# Native MSVC # Native MSVC or ICC
# hardcode_libdir_flag_spec is actually meaningless, as there is # hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs. # no search path for DLLs.
hardcode_libdir_flag_spec_CXX=' ' hardcode_libdir_flag_spec_CXX=' '
@ -15210,7 +15203,7 @@ fi
# explicitly linking system object files so we need to strip them # explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library # from the output so that they don't get included in the library
# dependencies. # dependencies.
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "[-]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;; ;;
*) *)
if test yes = "$GXX"; then if test yes = "$GXX"; then
@ -15275,7 +15268,7 @@ fi
# explicitly linking system object files so we need to strip them # explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library # from the output so that they don't get included in the library
# dependencies. # dependencies.
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "[-]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;; ;;
*) *)
if test yes = "$GXX"; then if test yes = "$GXX"; then
@ -15614,7 +15607,7 @@ fi
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[-]L"'
else else
# FIXME: insert proper C++ library support # FIXME: insert proper C++ library support
@ -15698,7 +15691,7 @@ fi
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[-]L"'
else else
# g++ 2.7 appears to require '-G' NOT '-shared' on this # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform. # platform.
@ -15709,7 +15702,7 @@ fi
# Commands to make compiler produce verbose output that lists # Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when # what "hidden" libraries, object files and flags are used when
# linking a shared library. # linking a shared library.
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[-]L"'
fi fi
hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
@ -16023,7 +16016,7 @@ lt_prog_compiler_static_CXX=
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
mingw* | cygwin* | os2* | pw32* | cegcc*) mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style # Although the cygwin gcc ignores -fPIC, still need this for old-style
@ -16098,7 +16091,7 @@ lt_prog_compiler_static_CXX=
;; ;;
esac esac
;; ;;
mingw* | cygwin* | os2* | pw32* | cegcc*) mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being # This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example). # built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_CXX='-DDLL_EXPORT' lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
@ -16592,9 +16585,9 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
pw32*) pw32*)
export_symbols_cmds_CXX=$ltdll_cmds export_symbols_cmds_CXX=$ltdll_cmds
;; ;;
cygwin* | mingw* | cegcc*) cygwin* | mingw* | windows* | cegcc*)
case $cc_basename in case $cc_basename in
cl*) cl* | icl*)
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
;; ;;
*) *)
@ -16914,7 +16907,7 @@ bsdi[45]*)
# libtool to hard-code these into programs # libtool to hard-code these into programs
;; ;;
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | windows* | pw32* | cegcc*)
version_type=windows version_type=windows
shrext_cmds=.dll shrext_cmds=.dll
need_version=no need_version=no
@ -16946,7 +16939,7 @@ cygwin* | mingw* | pw32* | cegcc*)
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization
;; ;;
mingw* | cegcc*) mingw* | windows* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix # MinGW DLLs use traditional 'lib' prefix
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' #soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
@ -16959,14 +16952,14 @@ cygwin* | mingw* | pw32* | cegcc*)
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
;; ;;
*,cl*) *,cl* | *,icl*)
# Native MSVC # Native MSVC or ICC
libname_spec='$name' libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib' library_names_spec='$libname.dll.lib'
case $build_os in case $build_os in
mingw*) mingw* | windows*)
sys_lib_search_path_spec= sys_lib_search_path_spec=
lt_save_ifs=$IFS lt_save_ifs=$IFS
IFS=';' IFS=';'
@ -17016,7 +17009,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;; ;;
*) *)
# Assume MSVC wrapper # Assume MSVC and ICC wrapper
library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
;; ;;