4 files changed, 31 insertions, 9 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 4ad02335c8ea..23940c30f8d1 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -47,14 +47,14 @@ $(MINGWGXXDLL) :
 
 .EXPORT : CC
 
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
+all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
 
 
 $(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
-       $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
+    $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
 
-$(LB)$/libgcc_s.so.1 :
-       $(GCCINSTLIB) libgcc_s.so.1 $(LB)
+$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
+    $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
 
 .ENDIF
 .ENDIF 
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 57aae6a9c0fd..dddc22a3e009 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
  extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,63 @@
+@@ -1 +1,70 @@
 -dummy
 +#*************************************************************************
 +#
@@ -123,14 +123,16 @@
 +
 +# --- Files --------------------------------------------------------
 +
++.IF "$(HAVE_GETOPT)" != "YES"
 +OBJFILES=	$(OBJ)$/getopt.obj		\
 +			$(OBJ)$/getopt1.obj
 +
 +LIB1TARGET=$(SLB)$/$(TARGET).lib
 +LIB1ARCHIV=$(LB)$/lib$(TARGET).a
 +LIB1OBJFILES=$(OBJFILES)
++.ENDIF
 +
-+.IF "$(OS)"=="NETBSD"
++.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
 +TARGET2=gnu_readdir_r
 +OBJFILES+= $(OBJ)$/readdir_r.obj
 +LIB2TARGET=$(SLB)$/$(TARGET2).lib
@@ -138,6 +140,11 @@
 +LIB2OBJFILES= $(OBJ)$/readdir_r.obj
 +.ENDIF
 +
++.IF "$(HAVE_READDIR_R)" == "YES" && "$(HAVE_GETOPT)" == "YES"
++@all:
++	@echo "Nothing to do here.
++.ENDIF
++
 +# --- Targets ------------------------------------------------------
 +
 +.INCLUDE :  target.mk
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index cf4516515a67..04e2ff5b99bd 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -36,10 +36,14 @@ TARGET=getopt
 
 # --- Files --------------------------------------------------------
 
+.IF "$(HAVE_GETOPT)" != "YES" || "$(HAVE_READDIR_R)" != "YES"
 TARFILE_NAME=glibc-2.1.3-stub
 TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
 TARFILE_ROOTDIR=glibc-2.1.3
-ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c
+ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
+.IF "$(HAVE_READDIR_R)" != "YES"
+ADDITIONAL_FILES += posix$/readdir_r.c
+.ENDIF
 
 PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
 
@@ -49,6 +53,15 @@ CONFIGURE_ACTION=
 BUILD_DIR=posix
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
+OUT2INC= \
+    posix/getopt.h \
+    posix/config.h
+
+.ELSE
+@all:
+    @echo "Nothing to do here."
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 2c50c4c6f801..9e0c68129c77 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -12,14 +12,16 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
 ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
 ..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
 
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+
 ..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
 ..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
 ..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
 
 ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
 
-..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1
-..\%__SRC%\lib\libstdc++.so.6 %_DEST%\lib%_EXT%\libstdc++.so.6
+..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
+..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
 
 ..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll