X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=b2296390974f7a125e5c9f805c6b12a0b9fd0002;hb=a296464ea37be983319a0411d5439a29e3835d17;hp=1de433c2a670b93b6f94f7dab0189a5a2be9ea5a;hpb=3919d2606f5f6b2aad81c4c359573b3035994154;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 1de433c..b229639 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.186 2001/08/15 14:02:54 sewardj Exp $ +# $Id: Makefile,v 1.187 2001/08/15 14:36:21 rrt Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -143,19 +143,16 @@ HS_SRCS += $(CONFIG_HS) # GHC with GHC 5.02 or better, but lacking that we have the following # hack: # copy rawSystem.c from hslibs/lang/cbits -# and SystemExts.lhs from hslibs/lang -# into main/ (where they'll be compiled and linked with the compiler) +# into main/ (where it'll be compiled and linked with the compiler) +# (the Haskell-side code is ifdefed into main/SysTools.lhs) ifneq "$(ghc_502_at_least)" "YES" C_SRCS += main/rawSystem.c -HS_SRCS := $(filter-out main/SystemExts.lhs,$(HS_SRCS)) main/SystemExts.lhs SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits HS_OBJS += main/rawSystem.o main/rawSystem.c : $(FPTOOLS_TOP)/hslibs/lang/cbits/rawSystem.c $(CP) $< main -main/SystemExts.lhs: $(FPTOOLS_TOP)/hslibs/lang/SystemExts.lhs - $(CP) $< main endif endif # End of system hack