diff -ur libX11-1.1.4.org/src/Makefile.am libX11-1.1.4/src/Makefile.am
--- libX11-1.1.4.org/src/Makefile.am	2008-03-06 21:45:06.000000000 +0100
+++ libX11-1.1.4/src/Makefile.am	2008-06-23 21:24:16.000000000 +0200
@@ -426,6 +426,6 @@
 	mv ks_tables_h $@
 
 $(top_builddir)/src/util/makekeys$(EXEEXT): force
-	cd util && $(MAKE)
+	cd util && $(MAKE) CC=gcc
 
 force:
diff -ur libX11-1.1.4.org/src/Makefile.in libX11-1.1.4/src/Makefile.in
--- libX11-1.1.4.org/src/Makefile.in	2008-03-06 21:48:51.000000000 +0100
+++ libX11-1.1.4/src/Makefile.in	2008-06-23 21:24:16.000000000 +0200
@@ -1247,7 +1247,7 @@
 	mv ks_tables_h $@
 
 $(top_builddir)/src/util/makekeys$(EXEEXT): force
-	cd util && $(MAKE)
+	cd util && $(MAKE) CC=gcc
 
 force:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.