--- unixport/makefile	2005-01-15 11:34:45.000000000 -0500
+++ unixport/makefile	2009-12-07 12:35:23.000000000 -0500
@@ -21,7 +21,7 @@
 LD_FLAGS:=$(LD_FLAGS) $(ODIR)/$(FIRST_FILE)
 endif
 LD_LIBS_PRE:=$(addprefix -u ,$(PATCHED_SYMBOLS))
-LD_LIBS_POST:=$(LIBS) $(LIBC) -lgclp
+LD_LIBS_POST:=-lgclp $(LIBS) $(LIBC)
 ifneq ($(LAST_FILE),)
 LD_LIBS_POST:=$(LD_LIBS_POST) $(ODIR)/$(LAST_FILE)
 endif
@@ -139,7 +139,7 @@
 	$(CC) $(LD_FLAGS) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
 
 msys: msys.c
-	PATH=/usr/bin:$$PATH gcc $< -o $@ # Unix binary if running wine
+	PATH=/usr/bin:$$PATH $(CC) $< -o $@ # Unix binary if running wine
 
 $(HDIR)/mdefs.h: $(HDIR)/include.h
 	cat $(HDIR)/include.h | sed -e "/include/d" > $(HDIR)/mdefs.h