Commit 81ab057b authored by malcolm's avatar malcolm

[project @ 2005-03-10 17:58:42 by malcolm]

Define __CYGWIN32__ for nhc98 build of hsc2hs.
parent 59765e87
{-# OPTIONS -fffi -cpp #-}
------------------------------------------------------------------------
-- $Id: Main.hs,v 1.71 2005/01/29 12:15:33 ross Exp $
-- $Id: Main.hs,v 1.72 2005/03/10 17:58:42 malcolm Exp $
--
-- Program for converting .hsc files to .hs files, by converting the
-- file into a C program which is run to generate the Haskell source.
......@@ -512,7 +512,7 @@ output flags name toks = do
let cProgName = outDir++outBase++"_hsc_make.c"
oProgName = outDir++outBase++"_hsc_make.o"
progName = outDir++outBase++"_hsc_make"
#if defined(mingw32_HOST_OS)
#if defined(mingw32_HOST_OS) || defined(__CYGWIN32__)
-- This is a real hack, but the quoting mechanism used for calling the C preprocesseor
-- via GHC has changed a few times, so this seems to be the only way... :-P * * *
++ ".exe"
......@@ -873,7 +873,7 @@ showCString = concatMap showCChar
-- Convert paths foo/baz to foo\baz on Windows
dosifyPath, unDosifyPath :: String -> String
#if defined(mingw32_HOST_OS)
#if defined(mingw32_HOST_OS) || defined(__CYGWIN32__)
dosifyPath xs = subst '/' '\\' xs
unDosifyPath xs = subst '\\' '/' xs
......
......@@ -34,7 +34,7 @@ realclean: clean cleanC
$(TARGET): $(OBJDIR) $(SRCS)
$(HMAKE) -hc=$(HC) Main -d$(OBJDIR) -DBUILD_NHC \
$(shell echo "${BUILDOPTS}") $(HFLAGS)
$(shell echo "${BUILDOPTS}") $(HFLAGS) $(CYGFLAG)
mv $(OBJDIR)/Main$(EXE) $(TARGET)
$(STRIP) $(TARGET)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment