# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.165 2001/06/26 11:07:55 simonpj Exp $
+# $Id: Makefile,v 1.167 2001/06/28 14:41:19 simonmar Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
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
-
-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'.
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"
@$(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