===================================================================
RCS file: /cvs/djgpp/djgpp/src/utils/gxx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -u -r1.2 -r1.3
--- djgpp/src/utils/gxx.c	1996/04/26 19:02:50	1.2
+++ /cvs/djgpp/djgpp/src/utils/gxx.c	1998/10/31 11:55:46	1.3
@@ -1,10 +1,11 @@
+/* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
 #include <stdio.h>
 #include <process.h>
 #include <stdlib.h>
 
 char lgpp[] = "-lgpp";
-char lstdc[] = "-lstdcx";
+char lstdc[] = "-lstdcxx";
 char lm[] = "-lm";
 
 int
@@ -12,12 +13,21 @@ main(int argc, char **argv)
 {
   char **newargs = (char **)malloc((argc+4) * sizeof(char *));
   int i;
+  int add_libs = 1;
+
   for (i=0; i<argc; i++)
+  {
+    if (strcmp(argv[i], "-c") == 0
+	|| strcmp(argv[i], "-S") == 0)
+      add_libs = 0;
     newargs[i] = argv[i];
+  }
 
-  newargs[i++] = lgpp;
-  newargs[i++] = lstdc;
-  newargs[i++] = lm;
+  if (add_libs) {
+    newargs[i++] = lstdc;
+    newargs[i++] = lgpp;
+    newargs[i++] = lm;
+  }
   newargs[i++] = 0;
 
   return execvp("gcc.exe", newargs);