1.0.47.32: Fix build on MinGW

   * Patch by Elliott Slaughter (lp#777339)

diff --git a/src/runtime/Config.x86-win32 b/src/runtime/Config.x86-win32
index b341808..6c77482 100644 (file)
--- a/src/runtime/Config.x86-win32
+++ b/src/runtime/Config.x86-win32
@@ -25,19 +25,25 @@ OS_SRC = win32-os.c x86-win32-os.c os-common.c
 # (You *are* encouraged to design and implement a coherent stable
 # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
 # working on one and it would be a nice thing to have.)
-OS_LINK_FLAGS = -Wl,--export-dynamic,-mno-cygwin
-OS_LIBS = -mno-cygwin
+OS_LINK_FLAGS = -Wl,--export-dynamic
+OS_LIBS =
 
 GC_SRC = gencgc.c
 
-CFLAGS =  -g -Wall -O3 -mno-cygwin
+CFLAGS =  -g -Wall -O3
 ASFLAGS = $(CFLAGS)
 
 CPP = cpp
-CC = gcc-3
+CC = gcc
 LD = ld
 NM = nm
 
+ifneq ($(findstring cygwin,$(shell $(CC) -dumpmachine)),)
+OS_LINK_FLAGS := $(OS_LINK_FLAGS) -Wl,-mno-cygwin
+OS_LIBS := $(OS_LIBS) -mno-cygwin
+CFLAGS := $(CFLAGS) -mno-cygwin
+endif
+
 # Nothing to do for after-grovel-headers.
 .PHONY: after-grovel-headers
 after-grovel-headers:

diff --git a/version.lisp-expr b/version.lisp-expr
index 155d55a..2993dd8 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -20,4 +20,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.47.31"
+"1.0.47.32"