|
|
@@ -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 "checking for ld used by $CC... " >&6; }
|
|
|
case $host in
|
|
|
- *-*-mingw*)
|
|
|
+ *-*-mingw* | *-*-windows*)
|
|
|
# gcc leaves a trailing carriage return, which upsets mingw
|
|
|
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
|
|
|
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
|
|
|
case $build_os in
|
|
|
- mingw*) lt_bad_file=conftest.nm/nofile ;;
|
|
|
+ mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
|
|
|
*) lt_bad_file=/dev/null ;;
|
|
|
esac
|
|
|
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;
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | cegcc*)
|
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
|
@@ -5555,7 +5555,7 @@ else $as_nop
|
|
|
case $host in
|
|
|
*-*-mingw* )
|
|
|
case $build in
|
|
|
- *-*-mingw* ) # actually msys
|
|
|
+ *-*-mingw* | *-*-windows* ) # actually msys
|
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
|
;;
|
|
|
*-*-cygwin* )
|
|
|
@@ -5568,7 +5568,7 @@ else $as_nop
|
|
|
;;
|
|
|
*-*-cygwin* )
|
|
|
case $build in
|
|
|
- *-*-mingw* ) # actually msys
|
|
|
+ *-*-mingw* | *-*-windows* ) # actually msys
|
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
|
;;
|
|
|
*-*-cygwin* )
|
|
|
@@ -5603,9 +5603,9 @@ else $as_nop
|
|
|
#assume ordinary cross tools, or native build.
|
|
|
lt_cv_to_tool_file_cmd=func_convert_file_noop
|
|
|
case $host in
|
|
|
- *-*-mingw* )
|
|
|
+ *-*-mingw* | *-*-windows* )
|
|
|
case $build in
|
|
|
- *-*-mingw* ) # actually msys
|
|
|
+ *-*-mingw* | *-*-windows* ) # actually msys
|
|
|
lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
|
|
|
;;
|
|
|
esac
|
|
|
@@ -5639,7 +5639,7 @@ case $reload_flag in
|
|
|
esac
|
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
|
case $host_os in
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
if test yes != "$GCC"; then
|
|
|
reload_cmds=false
|
|
|
fi
|
|
|
@@ -5812,7 +5812,7 @@ cygwin*)
|
|
|
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
|
|
|
# func_win32_libid shell function, so use a weaker test based on 'objdump',
|
|
|
# unless we find 'file', for example because we are cross-compiling.
|
|
|
@@ -5980,7 +5980,7 @@ file_magic_glob=
|
|
|
want_nocaseglob=no
|
|
|
if test "$build" = "$host"; then
|
|
|
case $host_os in
|
|
|
- mingw* | pw32*)
|
|
|
+ mingw* | windows* | pw32*)
|
|
|
if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
|
|
|
want_nocaseglob=yes
|
|
|
else
|
|
|
@@ -6134,7 +6134,7 @@ else $as_nop
|
|
|
lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
|
|
case $host_os in
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
# two different shell functions defined in ltmain.sh;
|
|
|
# decide which one to use based on capabilities of $DLLTOOL
|
|
|
case `$DLLTOOL --help 2>&1` in
|
|
|
@@ -6572,15 +6572,8 @@ old_postinstall_cmds='chmod 644 $oldlib'
|
|
|
old_postuninstall_cmds=
|
|
|
|
|
|
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_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
|
|
|
fi
|
|
|
|
|
|
case $host_os in
|
|
|
@@ -6707,7 +6700,7 @@ case $host_os in
|
|
|
aix*)
|
|
|
symcode='[BCDT]'
|
|
|
;;
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
symcode='[ABCDGISTW]'
|
|
|
;;
|
|
|
hpux*)
|
|
|
@@ -6786,7 +6779,7 @@ $lt_c_name_lib_hook\
|
|
|
# Handle CRLF in mingw tool chain
|
|
|
opt_cr=
|
|
|
case $build_os in
|
|
|
-mingw*)
|
|
|
+mingw* | windows*)
|
|
|
opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
|
|
|
;;
|
|
|
esac
|
|
|
@@ -6801,7 +6794,7 @@ for ac_symprfx in "" "_"; do
|
|
|
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
|
|
|
# Fake it for dumpbin and say T for any non-static function,
|
|
|
# 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 ?.
|
|
|
lt_cv_sys_global_symbol_pipe="$AWK '"\
|
|
|
" {last_section=section; section=\$ 3};"\
|
|
|
@@ -7235,7 +7228,7 @@ mips64*-*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
|
|
|
# options accordingly. Note that the listed cases only cover the
|
|
|
# situations where additional linker options are needed (such as when
|
|
|
@@ -7254,7 +7247,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
x86_64-*kfreebsd*-gnu)
|
|
|
LD="${LD-ld} -m elf_i386_fbsd"
|
|
|
;;
|
|
|
- x86_64-*linux*)
|
|
|
+ x86_64-*linux*|x86_64-gnu*)
|
|
|
case `/usr/bin/file conftest.o` in
|
|
|
*x86-64*)
|
|
|
LD="${LD-ld} -m elf32_x86_64"
|
|
|
@@ -7283,7 +7276,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
x86_64-*kfreebsd*-gnu)
|
|
|
LD="${LD-ld} -m elf_x86_64_fbsd"
|
|
|
;;
|
|
|
- x86_64-*linux*)
|
|
|
+ x86_64-*linux*|x86_64-gnu*)
|
|
|
LD="${LD-ld} -m elf_x86_64"
|
|
|
;;
|
|
|
powerpcle-*linux*|powerpc64le-*linux*)
|
|
|
@@ -8279,7 +8272,7 @@ fi
|
|
|
enable_win32_dll=yes
|
|
|
|
|
|
case $host in
|
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
|
+*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
|
|
|
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.
|
|
|
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
|
@@ -8895,8 +8888,8 @@ esac
|
|
|
ofile=libtool
|
|
|
can_build_shared=yes
|
|
|
|
|
|
-# All known linkers require a '.a' archive for static linking (except MSVC,
|
|
|
-# which needs '.lib').
|
|
|
+# All known linkers require a '.a' archive for static linking (except MSVC and
|
|
|
+# ICC, which need '.lib').
|
|
|
libext=a
|
|
|
|
|
|
with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
|
@@ -9220,7 +9213,7 @@ lt_prog_compiler_static=
|
|
|
# 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
|
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
|
@@ -9323,7 +9316,7 @@ lt_prog_compiler_static=
|
|
|
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
|
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
|
@@ -9830,16 +9823,16 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
|
|
|
extract_expsyms_cmds=
|
|
|
|
|
|
case $host_os in
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
+ # 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
|
|
|
- # Microsoft Visual C++.
|
|
|
+ # Microsoft Visual C++ or Intel C++ Compiler.
|
|
|
if test yes != "$GCC"; then
|
|
|
with_gnu_ld=no
|
|
|
fi
|
|
|
;;
|
|
|
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
|
|
|
;;
|
|
|
openbsd* | bitrig*)
|
|
|
@@ -9945,7 +9938,7 @@ _LT_EOF
|
|
|
fi
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
|
|
# as there is no search path for DLLs.
|
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
|
@@ -10490,14 +10483,14 @@ fi
|
|
|
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
|
|
|
- # Microsoft Visual C++.
|
|
|
+ # Microsoft Visual C++ or Intel C++ Compiler.
|
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
|
# no search path for DLLs.
|
|
|
case $cc_basename in
|
|
|
- cl*)
|
|
|
- # Native MSVC
|
|
|
+ cl* | icl*)
|
|
|
+ # Native MSVC or ICC
|
|
|
hardcode_libdir_flag_spec=' '
|
|
|
allow_undefined_flag=unsupported
|
|
|
always_export_symbols=yes
|
|
|
@@ -10507,14 +10500,14 @@ fi
|
|
|
# Tell ltmain to make .dll files, not .so files.
|
|
|
shrext_cmds=.dll
|
|
|
# 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
|
|
|
cp "$export_symbols" "$output_objdir/$soname.def";
|
|
|
echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
|
|
|
else
|
|
|
$SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
|
|
|
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='
|
|
|
# The linker will not automatically build a static lib if we build a DLL.
|
|
|
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
|
|
|
@@ -10538,7 +10531,7 @@ fi
|
|
|
fi'
|
|
|
;;
|
|
|
*)
|
|
|
- # Assume MSVC wrapper
|
|
|
+ # Assume MSVC and ICC wrapper
|
|
|
hardcode_libdir_flag_spec=' '
|
|
|
allow_undefined_flag=unsupported
|
|
|
# Tell ltmain to make .lib files, not .a files.
|
|
|
@@ -11304,7 +11297,7 @@ if test yes = "$GCC"; then
|
|
|
*) lt_awk_arg='/^libraries:/' ;;
|
|
|
esac
|
|
|
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' ;;
|
|
|
esac
|
|
|
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
|
|
|
# for these hosts.
|
|
|
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'` ;;
|
|
|
esac
|
|
|
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
|
|
|
;;
|
|
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
version_type=windows
|
|
|
shrext_cmds=.dll
|
|
|
need_version=no
|
|
|
@@ -11563,7 +11556,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
|
;;
|
|
|
- mingw* | cegcc*)
|
|
|
+ mingw* | windows* | cegcc*)
|
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
|
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
|
|
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'
|
|
|
;;
|
|
|
|
|
|
- *,cl*)
|
|
|
- # Native MSVC
|
|
|
+ *,cl* | *,icl*)
|
|
|
+ # Native MSVC or ICC
|
|
|
libname_spec='$name'
|
|
|
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
|
|
|
library_names_spec='$libname.dll.lib'
|
|
|
|
|
|
case $build_os in
|
|
|
- mingw*)
|
|
|
+ mingw* | windows*)
|
|
|
sys_lib_search_path_spec=
|
|
|
lt_save_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'
|
|
|
dynamic_linker='Win32 ld.exe'
|
|
|
;;
|
|
|
@@ -12303,7 +12296,7 @@ else
|
|
|
lt_cv_dlopen_self=yes
|
|
|
;;
|
|
|
|
|
|
- mingw* | pw32* | cegcc*)
|
|
|
+ mingw* | windows* | pw32* | cegcc*)
|
|
|
lt_cv_dlopen=LoadLibrary
|
|
|
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 "checking for ld used by $CC... " >&6; }
|
|
|
case $host in
|
|
|
- *-*-mingw*)
|
|
|
+ *-*-mingw* | *-*-windows*)
|
|
|
# gcc leaves a trailing carriage return, which upsets mingw
|
|
|
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
|
|
|
# what "hidden" libraries, object files and flags are used when
|
|
|
# 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
|
|
|
GXX=no
|
|
|
@@ -15011,10 +15004,10 @@ fi
|
|
|
esac
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
case $GXX,$cc_basename in
|
|
|
- ,cl* | no,cl*)
|
|
|
- # Native MSVC
|
|
|
+ ,cl* | no,cl* | ,icl* | no,icl*)
|
|
|
+ # Native MSVC or ICC
|
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
|
# no search path for DLLs.
|
|
|
hardcode_libdir_flag_spec_CXX=' '
|
|
|
@@ -15210,7 +15203,7 @@ fi
|
|
|
# explicitly linking system object files so we need to strip them
|
|
|
# from the output so that they don't get included in the library
|
|
|
# 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
|
|
|
@@ -15275,7 +15268,7 @@ fi
|
|
|
# explicitly linking system object files so we need to strip them
|
|
|
# from the output so that they don't get included in the library
|
|
|
# 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
|
|
|
@@ -15614,7 +15607,7 @@ fi
|
|
|
# Commands to make compiler produce verbose output that lists
|
|
|
# what "hidden" libraries, object files and flags are used when
|
|
|
# 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
|
|
|
# FIXME: insert proper C++ library support
|
|
|
@@ -15698,7 +15691,7 @@ fi
|
|
|
# Commands to make compiler produce verbose output that lists
|
|
|
# what "hidden" libraries, object files and flags are used when
|
|
|
# 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
|
|
|
# g++ 2.7 appears to require '-G' NOT '-shared' on this
|
|
|
# platform.
|
|
|
@@ -15709,7 +15702,7 @@ fi
|
|
|
# Commands to make compiler produce verbose output that lists
|
|
|
# what "hidden" libraries, object files and flags are used when
|
|
|
# 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
|
|
|
|
|
|
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*)
|
|
|
# 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
|
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
|
@@ -16098,7 +16091,7 @@ lt_prog_compiler_static_CXX=
|
|
|
;;
|
|
|
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
|
|
|
# built for inclusion in a dll (and should export symbols for example).
|
|
|
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
|
|
|
@@ -16592,9 +16585,9 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
|
|
|
pw32*)
|
|
|
export_symbols_cmds_CXX=$ltdll_cmds
|
|
|
;;
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | cegcc*)
|
|
|
case $cc_basename in
|
|
|
- cl*)
|
|
|
+ cl* | icl*)
|
|
|
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
|
;;
|
|
|
*)
|
|
|
@@ -16914,7 +16907,7 @@ bsdi[45]*)
|
|
|
# libtool to hard-code these into programs
|
|
|
;;
|
|
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
version_type=windows
|
|
|
shrext_cmds=.dll
|
|
|
need_version=no
|
|
|
@@ -16946,7 +16939,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization
|
|
|
|
|
|
;;
|
|
|
- mingw* | cegcc*)
|
|
|
+ mingw* | windows* | cegcc*)
|
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
|
#soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
|
|
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'
|
|
|
;;
|
|
|
|
|
|
- *,cl*)
|
|
|
- # Native MSVC
|
|
|
+ *,cl* | *,icl*)
|
|
|
+ # Native MSVC or ICC
|
|
|
libname_spec='$name'
|
|
|
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
|
|
|
library_names_spec='$libname.dll.lib'
|
|
|
|
|
|
case $build_os in
|
|
|
- mingw*)
|
|
|
+ mingw* | windows*)
|
|
|
sys_lib_search_path_spec=
|
|
|
lt_save_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'
|
|
|
dynamic_linker='Win32 ld.exe'
|
|
|
;;
|
Ozkan Sezer