1 --- libtool-2.4.3/m4/libtool.m4.orig 2014-10-29 18:46:29.364258811 +0100
2 +++ libtool-2.4.3/m4/libtool.m4 2014-10-29 20:55:40.250600202 +0100
4 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
6 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
7 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9 # If the export-symbols file already is a .def file, use it as
10 # is; otherwise, prepend EXPORTS...
11 _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
13 echo EXPORTS > $output_objdir/$soname.def;
14 cat $export_symbols >> $output_objdir/$soname.def;
16 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17 + $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
19 _LT_TAGVAR(ld_shlibs, $1)=no
21 @@ -5040,13 +5040,13 @@
22 *Sun\ F*) # Sun Fortran 8.3
23 tmp_sharedflag='-G' ;;
25 - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
26 + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
28 if test yes = "$supports_anon_versioning"; then
29 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
30 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
31 echo "local: *; };" >> $output_objdir/$libname.ver~
32 - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
33 + $CC '"$tmp_sharedflag""$tmp_addflag"' $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
38 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
41 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
42 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
43 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
44 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
51 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
52 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
53 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
54 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
55 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
57 _LT_TAGVAR(ld_shlibs, $1)=no
60 # requires that you compile everything twice, which is a pain.
61 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
62 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
63 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
64 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
65 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
66 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
68 _LT_TAGVAR(ld_shlibs, $1)=no
73 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
74 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
75 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
76 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
77 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
79 _LT_TAGVAR(ld_shlibs, $1)=no
81 @@ -5272,12 +5272,12 @@
83 _LT_SYS_MODULE_PATH_AIX([$1])
84 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
85 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
86 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $compiler_flags $libobjs $deplibs $wl'$no_entry_flag' `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
88 if test ia64 = "$host_cpu"; then
89 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
90 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
91 - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
92 + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs '"\$wl$no_entry_flag"' $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
94 # Determine the default libpath from the value encoded in an
97 # Tell ltmain to make .dll files, not .so files.
99 # FIXME: Setting linknames here is a bad hack.
100 - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
101 + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
102 # The linker will automatically build a .lib file if we build a DLL.
103 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
104 # FIXME: Should let the user specify the lib program.
105 @@ -5417,7 +5417,7 @@
107 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
108 freebsd* | dragonfly*)
109 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
110 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
111 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
112 _LT_TAGVAR(hardcode_direct, $1)=yes
113 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
114 @@ -5514,7 +5514,7 @@
116 irix5* | irix6* | nonstopux*)
117 if test yes = "$GCC"; then
118 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
119 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags $libobjs $deplibs $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
120 # Try to use the -exported_symbol ld option, if it does not
121 # work, assume that -exports_file does not work either and
122 # implicitly export all symbols.
123 @@ -5578,12 +5578,12 @@
124 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
125 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
126 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
127 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
128 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
129 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
130 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs $wl-retain-symbols-file,$export_symbols'
131 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
132 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
134 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
135 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
136 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
139 @@ -5634,9 +5634,9 @@
140 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
141 if test yes = "$GCC"; then
143 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
144 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $compiler_flags $libobjs $deplibs'
145 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
146 - $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
147 + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $compiler_flags $libobjs $deplibs~$RM $lib.exp'
149 case `$CC -V 2>&1` in
151 @@ -5647,9 +5647,9 @@
155 - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
156 + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $compiler_flags $libobjs $deplibs'
157 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
158 - $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
159 + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $compiler_flags $libobjs $deplibs~$RM $lib.exp'
163 @@ -6119,8 +6119,8 @@
164 # Check if GNU C++ uses GNU ld as the underlying linker, since the
165 # archiving commands below assume that GNU ld is being used.
166 if test yes = "$with_gnu_ld"; then
167 - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
168 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
169 + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-soname $wl$soname -o $lib'
170 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
172 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
173 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
174 @@ -6146,7 +6146,7 @@
175 # linker, instead of GNU ld. If possible, this setting should
176 # overridden to take advantage of the native linker features on
177 # the platform it is being used on.
178 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
179 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
182 # Commands to make compiler produce verbose output that lists
183 @@ -6369,7 +6369,7 @@
184 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
186 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
187 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
188 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
189 # If the export-symbols file already is a .def file, use it as
190 # is; otherwise, prepend EXPORTS...
191 _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
192 @@ -6378,7 +6378,7 @@
193 echo EXPORTS > $output_objdir/$soname.def;
194 cat $export_symbols >> $output_objdir/$soname.def;
196 - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
197 + $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
199 _LT_TAGVAR(ld_shlibs, $1)=no
201 @@ -6592,8 +6592,8 @@
202 # KCC will only create a shared library if the output file
203 # ends with ".so" (or ".sl" for HP-UX), so rename the library
204 # to its proper name (with version) after linking.
205 - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
206 - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
207 + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
208 + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
209 # Commands to make compiler produce verbose output that lists
210 # what "hidden" libraries, object files and flags are used when
211 # linking a shared library.
212 @@ -6619,16 +6619,16 @@
213 # earlier do not add the objects themselves.
214 case `$CC -V 2>&1` in
216 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
217 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
218 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-soname $wl$soname -o $lib'
219 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
221 *) # Version 8.0 or newer
224 ia64*) tmp_idyn=' -i_dynamic';;
226 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
227 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
228 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $compiler_flags $libobjs $deplibs $wl-soname $wl$soname -o $lib'
229 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $compiler_flags $libobjs $deplibs $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
232 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
233 @@ -6704,8 +6704,8 @@
236 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
237 - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
238 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
239 + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
240 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $compiler_flags $libobjs $deplibs $postdep_objects $wl-retain-symbols-file $wl$export_symbols'
241 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
242 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
243 _LT_TAGVAR(compiler_needs_object, $1)=yes
244 @@ -6770,10 +6770,10 @@
245 _LT_TAGVAR(hardcode_direct, $1)=yes
246 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
247 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
248 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
249 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
250 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
251 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
252 - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
253 + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-retain-symbols-file,$export_symbols -o $lib'
254 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
255 _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
257 @@ -6896,9 +6896,9 @@
258 # Sun C++ 4.2, 5.x and Centerline C++
259 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
260 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
261 - _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
262 + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
263 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
264 - $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
265 + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$RM $lib.exp'
267 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
268 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
269 @@ -6933,9 +6933,9 @@
270 if test yes,no = "$GXX,$with_gnu_ld"; then
271 _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
272 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
273 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
274 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-h $wl$soname -o $lib'
275 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
276 - $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
277 + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$RM $lib.exp'
279 # Commands to make compiler produce verbose output that lists
280 # what "hidden" libraries, object files and flags are used when
281 @@ -6944,9 +6944,9 @@
283 # g++ 2.7 appears to require '-G' NOT '-shared' on this
285 - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
286 + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects $wl-h $wl$soname -o $lib'
287 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
288 - $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
289 + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$RM $lib.exp'
291 # Commands to make compiler produce verbose output that lists
292 # what "hidden" libraries, object files and flags are used when