Use a unique base address for each DLL.
Fixed ltmain.sh for MSYS development environment. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40731
This commit is contained in:
parent
1e1fe1f905
commit
df7110eda7
2 changed files with 10 additions and 5 deletions
|
@ -3043,7 +3043,7 @@ case $host_os in
|
|||
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
||||
|
||||
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
|
||||
# If the export-symbols file already is a .def file (1st line
|
||||
# is EXPORTS), use it as is; otherwise, prepend...
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
||||
|
@ -3052,7 +3052,7 @@ case $host_os in
|
|||
echo EXPORTS > $output_objdir/$soname.def;
|
||||
cat $export_symbols >> $output_objdir/$soname.def;
|
||||
fi~
|
||||
$CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
|
||||
$CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
|
@ -5266,7 +5266,7 @@ EOF
|
|||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
|
||||
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
|
||||
# If the export-symbols file already is a .def file (1st line
|
||||
# is EXPORTS), use it as is; otherwise, prepend...
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
||||
|
@ -5275,7 +5275,7 @@ EOF
|
|||
echo EXPORTS > $output_objdir/$soname.def;
|
||||
cat $export_symbols >> $output_objdir/$soname.def;
|
||||
fi~
|
||||
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
|
||||
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--out-implib,$lib'
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue