Commit 5d090a31 authored by rrt's avatar rrt
Browse files

[project @ 2001-07-03 16:46:21 by rrt]

Get rid of MinimalUnixDeps (now == mingwin)
parent a72f9438
# -----------------------------------------------------------------------------
# $Id: Makefile,v 1.167 2001/06/28 14:41:19 simonmar Exp $
# $Id: Makefile,v 1.168 2001/07/03 16:46:21 rrt Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
......@@ -123,8 +123,7 @@ endif
# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in
# for explanatory comment as to what this does.
ifeq "$(MinimalUnixDeps)" "YES"
SRC_HC_OPTS += -DMINIMAL_UNIX_DEPS
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -gt 5000); then echo YES; else echo NO; fi)
ifneq "$(ghc_501_at_least)" "YES"
......@@ -359,7 +358,7 @@ ghc-inplace : $(HS_PROG)
echo '#!/bin/sh' >>$@
echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
chmod 755 $@
ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES"
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@$(RM) $@.bat
echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %*" >$@.bat
chmod 755 $@.bat
......
-----------------------------------------------------------------------------
-- $Id: DriverPipeline.hs,v 1.85 2001/06/29 12:58:20 rrt Exp $
-- $Id: DriverPipeline.hs,v 1.86 2001/07/03 16:46:21 rrt Exp $
--
-- GHC Driver
--
......@@ -333,7 +333,7 @@ run_phase Cpp basename suff input_fn output_fn
-- ToDo: switch away from using 'echo' altogether (but need
-- a faster alternative than what's done below).
#if defined(mingw32_TARGET_OS) && defined(MINIMAL_UNIX_DEPS)
#if defined(mingw32_TARGET_OS)
else do
h <- openFile output_fn WriteMode
hPutStrLn h ("{-# LINE 1 \"" ++ input_fn ++ "\" #-}")
......
Supports Markdown
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