Index: Imake.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.rules,v
retrieving revision 1.6
diff -u -d -r1.6 Imake.rules
--- Imake.rules	13 Aug 2004 17:21:43 -0000	1.6
+++ Imake.rules	3 Dec 2004 22:13:07 -0000
@@ -3502,7 +3502,7 @@
 									@@\
 module: modlist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) modlist				@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist			@@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
@@ -3517,7 +3517,7 @@
 									@@\
 module: deplist								@@\
 	RemoveFile($@)							@@\
-	$(CC) -o $@ $(SHLIBLDFLAGS) modlist				@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist			@@\
 									@@\
 clean::									@@\
 	RemoveFile(module)
Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.7
diff -u -d -r1.7 Imake.tmpl
--- Imake.tmpl	9 Oct 2004 22:04:13 -0000	1.7
+++ Imake.tmpl	3 Dec 2004 22:13:08 -0000
@@ -1095,6 +1095,12 @@
 #ifndef HasGcc
 #define HasGcc HasGcc2
 #endif
+#ifndef HasIntelC
+#define HasIntelC NO
+#endif
+#ifndef HasSunC
+#define HasSunC NO
+#endif
 #ifndef HasBrokenCCForLink
 #define HasBrokenCCForLink NO
 #endif
@@ -1942,6 +1948,11 @@
          SHLIBDEF = SharedLibraryDef
 #ifdef SharedLibraryLoadFlags
      SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS)
+#if HasGcc || HasIntelC
+         NOSTDLIB = -nostdlib
+#elif HasSunC
+         NOSTDLIB = -xnolib
+#endif
 #endif
 /*
  * Here we set up flags needed to produce position-independent code