# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.161 2001/06/22 13:31:29 rrt Exp $
+# $Id: Makefile,v 1.168 2001/07/03 16:46:21 rrt Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -DILX
endif
+#
+# Canonicalize the GHC version number - assume it is has the form x.yy.[z] or
+# x.yy[.date] where date = yyyymmdd
+#
+# [First sed substitution gets rid of the '.', second gets rid of the date portion,
+# third appends a '0' if the z portion is missing]
+#
+CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)........$$/\1/g;s/^\(...\)$$/\10/g')
+
+# 20010625
+
ifeq "$(BootingFromHc)" "YES"
# HC files are always from a self-booted compiler
-ghc_411_at_least = 1
+ghc_411_at_least = YES
else
-ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
+ghc_411_at_least=$(shell if (test $(CANON_HC_VERSION) -ge 4110); then echo YES; else echo NO; fi)
endif
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(ghc_411_at_least)" "1"
+ifeq "$(ghc_411_at_least)" "YES"
SRC_HC_OPTS += -DGHCI
DIRS += ghci
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
-ghc_501_at_least = $(shell expr "$(GhcVersion)" \> 5.00)
-ifneq "$(ghc_501_at_least)" "1"
+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"
boot ::
$(CP) ../lib/std/cbits/system.c main
+# Build GHC 5.xx's version of systemCmd, so that even when bootstrapping with 4.08, we
+# can assume that system works properly on Win32
C_SRCS += main/system.c
SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
HCS += rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc
endif
-HS_OBJS = \
- $(patsubst %.hc, %.o, $(HCS)) \
- parser/hschooks.o
-
-ifneq "$(ghc_501_at_least)" "1"
-HS_OBJS += main/system.o
-endif
-
-DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
-
#
# Add misc .c helper code (used by the frontend.)
#
C_SRCS += parser/hschooks.c
+HS_OBJS = \
+ $(patsubst %.hc, %.o, $(HCS)) \
+ $(patsubst %.c, %.o, $(C_SRCS))
+
+DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
+
#
# Big Fudge to get around inherent problem that Makefile setup
# has got with 'mkdependC'.
# The latest GHC version doesn't have a -K option yet, and it doesn't
# seem to be necessary anymore for the modules below.
-ifeq "$(ghc_411_at_least)" "0"
+ifeq "$(ghc_411_at_least)" "NO"
rename/ParseIface_HC_OPTS += -K2m
parser/Parser_HC_OPTS += -K2m
endif
main/Finder_HC_OPTS = -fno-cse
main/SysTools_HC_OPTS = -fno-cse
+# The #include is vital for the via-C route, else the C
+# compiler doesn't realise that the stcall foreign imports are indeed
+# stdcall, and doesn't generate the Foo@8 name for them
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+main/SysTools_HC_OPTS += '-\#include <windows.h>'
+endif
+
# ----------------------------------------------------------------------------
# C compilations
ghc-inplace : $(HS_PROG)
@$(RM) $@
echo '#!/bin/sh' >>$@
- echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS)/ghc/compiler '"$$@"' >>$@
+ 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)/ghc/compiler %*" >$@.bat
+ echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %*" >$@.bat
chmod 755 $@.bat
endif