diff -Naur Mesa-7.7~orig/src/gallium/winsys/drm/intel/xorg/Makefile Mesa-7.7/src/gallium/winsys/drm/intel/xorg/Makefile
--- Mesa-7.7~orig/src/gallium/winsys/drm/intel/xorg/Makefile	2009-12-24 23:31:25.000000000 +0100
+++ Mesa-7.7/src/gallium/winsys/drm/intel/xorg/Makefile	2009-12-24 23:43:32.000000000 +0100
@@ -34,8 +34,8 @@
 all default: $(TARGET)
 
 $(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
-	$(TOP)/bin/mklib -noprefix -o $@ \
-	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
+	$(TOP)/bin/mklib -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+		$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
 
 clean:
 	rm -rf $(OBJECTS) $(TARGET)
diff -Naur Mesa-7.7~orig/src/gallium/winsys/drm/Makefile.template Mesa-7.7/src/gallium/winsys/drm/Makefile.template
--- Mesa-7.7~orig/src/gallium/winsys/drm/Makefile.template	2009-12-24 23:31:25.000000000 +0100
+++ Mesa-7.7/src/gallium/winsys/drm/Makefile.template	2009-12-25 00:02:24.000000000 +0100
@@ -83,13 +83,14 @@
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
 	$(MKLIB) -noprefix -o $@ \
+		-linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		$(OBJECTS) $(PIPE_DRIVERS) \
                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
                  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
 
 $(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
 	$(MKLIB) -o $(LIBNAME_EGL) \
-		-linker "$(CC)" \
+		-linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		-noprefix \
 		$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
 		--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)
diff -Naur Mesa-7.7~orig/src/gallium/winsys/drm/nouveau/xorg/Makefile Mesa-7.7/src/gallium/winsys/drm/nouveau/xorg/Makefile
--- Mesa-7.7~orig/src/gallium/winsys/drm/nouveau/xorg/Makefile	2009-12-24 23:31:25.000000000 +0100
+++ Mesa-7.7/src/gallium/winsys/drm/nouveau/xorg/Makefile	2009-12-24 23:44:15.000000000 +0100
@@ -38,8 +38,8 @@
 all default: $(TARGET)
 
 $(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
-	$(TOP)/bin/mklib -noprefix -o $@ \
-	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_nouveau
+	$(TOP)/bin/mklib -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+		$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_nouveau
 
 clean:
 	rm -rf $(OBJECTS) $(TARGET)
diff -Naur Mesa-7.7~orig/src/gallium/winsys/drm/radeon/xorg/Makefile Mesa-7.7/src/gallium/winsys/drm/radeon/xorg/Makefile
--- Mesa-7.7~orig/src/gallium/winsys/drm/radeon/xorg/Makefile	2009-12-24 23:31:25.000000000 +0100
+++ Mesa-7.7/src/gallium/winsys/drm/radeon/xorg/Makefile	2009-12-24 23:43:46.000000000 +0100
@@ -31,8 +31,8 @@
 all default: $(TARGET)
 
 $(TARGET): $(OBJECTS) Makefile $(GALLIUMDIR)/state_trackers/xorg/libxorgtracker.a
-	$(TOP)/bin/mklib -noprefix -o $@ \
-	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_radeon
+	$(TOP)/bin/mklib -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+		$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_radeon
 
 clean:
 	rm -rf $(OBJECTS) $(TARGET)
diff -Naur Mesa-7.7~orig/src/gallium/winsys/drm/vmware/xorg/Makefile Mesa-7.7/src/gallium/winsys/drm/vmware/xorg/Makefile
--- Mesa-7.7~orig/src/gallium/winsys/drm/vmware/xorg/Makefile	2009-12-24 23:31:25.000000000 +0100
+++ Mesa-7.7/src/gallium/winsys/drm/vmware/xorg/Makefile	2009-12-24 23:45:46.000000000 +0100
@@ -43,7 +43,8 @@
 all default: $(TARGET) $(TARGET_STAGING)
 
 $(TARGET): $(OBJECTS) Makefile $(LIBS)
-	$(MKLIB) -noprefix -o $@ $(OBJECTS) $(LIBS) $(LINKS)
+	$(MKLIB) -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+		$(OBJECTS) $(LIBS) $(LINKS)
 
 $(TOP)/$(LIB_DIR)/gallium:
 	mkdir -p $@