[project @ 2001-02-13 15:09:02 by rrt]

Make it work on Cygwin. Story of my life.

diff --git a/ghc/utils/hsc2hs/Main.hs b/ghc/utils/hsc2hs/Main.hs
index 18534df..c677e78 100644 (file)
--- a/ghc/utils/hsc2hs/Main.hs
+++ b/ghc/utils/hsc2hs/Main.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.17 2001/02/10 10:43:25 qrczak Exp $
+-- $Id: Main.hs,v 1.18 2001/02/13 15:09:02 rrt Exp $
 --
 -- (originally "GlueHsc.hs" by Marcin 'Qrczak' Kowalczyk)
 --
@@ -213,7 +213,11 @@ output flags name toks = let
         [c] -> return c
         _   -> onlyOne "compiler"
     linker <- case [l | Linker l <- flags] of
+#ifndef mingw32_TARGET_OS
         []  -> return "gcc"
+#else
+        []  -> return "gcc -mno-cygwin"
+#endif
         [l] -> return l
         _   -> onlyOne "linker"
         

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 2d69501..c8d4dc5 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 2001/02/10 10:43:25 qrczak Exp $
+# $Id: Makefile,v 1.9 2001/02/13 15:09:02 rrt Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -33,7 +33,11 @@ HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
 HSC2HS_DIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HSC2HS_EXTRA="--cc=$(CC) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
+else
+HSC2HS_EXTRA="--cc=$(CC) --cflag=-mno-cygwin --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
+endif
 endif
 
 $(SCRIPT_PROG) : Makefile