*** empty log message ***

libsdl-org · Dec 18, 2000 · 4e2baf2 · 4e2baf2
1 parent 5f358af
commit 4e2baf2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/ltconfig b/ltconfig
@@ -1188,7 +1188,7 @@ EOF
       $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,_DllMain@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbols _DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
       $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,_DllMain@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      strip $lib'
+      : strip_is_broken_with_dlls_on_win95B - strip $lib'
 
       old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
     ;;
@@ -1501,7 +1501,7 @@ else
     no_undefined_flag=' -z text'
     # $CC -shared without GNU ld will not create a library from C++
     # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='$LD -G${allow_undefined_flag} -h $rpath/$soname -o $lib $libobjs $deplibs $linkopts'
     archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
     hardcode_libdir_flag_spec=
@@ -1879,6 +1879,12 @@ cygwin* | mingw*)
   file_magic_cmd='${OBJDUMP} -f'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
+  if test "$with_gcc" = yes; then
+    # See where the system libraries really are - /usr/lib won't cut it
+    libuser32=`$CC --print-file-name=libuser32.a`
+    win32libs=`expr $libuser32 : '\(.*\)/.*'`
+    sys_lib_search_path_spec="$sys_lib_search_path $win32libs"
+  fi
   lt_cv_dlopen="LoadLibrary"
   lt_cv_dlopen_libs=
   ;;