[project @ 2003-02-05 11:42:08 by simonpj]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 550125a..f5bc1db 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -93,9 +93,24 @@ boot ::
        for i in $(ALL_DIRS); do \
            $(MKDIRHIER) stage$(stage)/$$i; \
        done
+# On Windows, we can't use symbolic links for the -hi-boot files
+# because GHC itself is a Mingw program and does not understand
+# symbolic links.  So we have to copy the files instead of link them.
+# That means that if you modify a .hi-boot file in Windows, you
+# have to to say 'make boot' again.
+#
+# PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz'
+#     whereas 'cp foo baz' treats the two paths independently.
+#     Hence the "../.." in the ln command line
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+       for i in */*hi-boot*; do \
+           cp -u -f $$i stage$(stage)/$$i; \
+       done
+else
        for i in */*hi-boot*; do \
            $(LN_S) -f ../../$$i stage$(stage)/$$i; \
        done
+endif
 
 ifeq "$(stage)" ""
 stage=1
@@ -113,13 +128,13 @@ ifeq "$(stage)" "3"
 HC=$(GHC_STAGE2)
 endif
 
-stage1 :
+stage1 ::
        $(MAKE) stage=1
 
-stage2 : 
+stage2 ::
        $(MAKE) stage=2
 
-stage3 : 
+stage3 ::
        $(MAKE) stage=3
 
 odir=stage$(stage)
@@ -219,7 +234,7 @@ CLEAN_FILES += $(CONFIG_HS)
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis compMan ndpFlatten
+  profiling parser cprAnalysis compMan ndpFlatten
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -262,7 +277,10 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 # Yes, include the interepreter, readline, and Template Haskell extensions
 SRC_HC_OPTS += -DGHCI -package haskell-src
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -package unix -package readline 
+SRC_HC_OPTS += -package unix
+ifeq "$(GhcLibsWithReadline)" "YES"
+SRC_HC_OPTS += -package readline 
+endif
 endif
 ALL_DIRS += ghci
 else
@@ -279,7 +297,11 @@ HS_OBJS     += $(C_OBJS)
 # Big Fudge to get around inherent problem that Makefile setup
 # has got with 'mkdependC'.
 # 
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR)
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+
+# XXX not really correct, hschooks.c actually gets include files like
+# RtsFlags.c from the installed GHC, but we can't tell mkdependC about that.
+SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 #              Haskell compilations
@@ -313,8 +335,8 @@ SRC_HC_OPTS += -package concurrent -package util
 endif
 endif
 
-SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
-SRC_HC_OPTS += -recomp $(GhcHcOpts)
+SRC_CC_OPTS += -Iparser -I. -O
+SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
 SRC_HC_OPTS += -H16M
 
 ifeq "$(BootingFromHc)" "YES"
@@ -355,6 +377,11 @@ ifeq "$(bootstrapped)" "YES"
 utils/Binary_HC_OPTS           = -funbox-strict-fields
 endif
 
+# 4.08.2's NCG can't cope with Binary
+ifeq "$(compiling_with_4xx)" "YES"
+utils/Binary_HC_OPTS           += -fvia-C
+endif
+
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
 ghci/ByteCodeLink_HC_OPTS      = -fvia-C -monly-3-regs
@@ -400,7 +427,6 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-needs-wrapper.hs-incl  \
             primop-can-fail.hs-incl  \
             primop-strictness.hs-incl  \
-            primop-usage.hs-incl  \
             primop-primop-info.hs-incl
 
 CLEAN_FILES += prelude/primops.txt
@@ -435,11 +461,14 @@ primop-can-fail.hs-incl: prelude/primops.txt
        $(GENPOC) --can-fail           < $< > $@
 primop-strictness.hs-incl: prelude/primops.txt
        $(GENPOC) --strictness         < $< > $@
-primop-usage.hs-incl: prelude/primops.txt
-       $(GENPOC) --usage              < $< > $@
 primop-primop-info.hs-incl: prelude/primops.txt
        $(GENPOC) --primop-primop-info < $< > $@
 
+# Usages aren't used any more; but the generator 
+# can still generate them if we want them back
+primop-usage.hs-incl: prelude/primops.txt
+       $(GENPOC) --usage              < $< > $@
+
 
 
 # ----------------------------------------------------------------------------
@@ -464,7 +493,7 @@ $(odir)/ghc-inplace : $(HS_PROG)
        chmod 755 $@
 
 ghc-inplace : stage1/ghc-inplace
-       $(LN_S) $< $@
+       $(LN_S) -f $< $@
 
 CLEAN_FILES += $(odir)/ghc-inplace ghc-inplace
 
@@ -514,7 +543,7 @@ include $(TOP)/mk/target.mk
 # -----------------------------------------------------------------------------
 # Dependencies
 
-MKDEPENDHS_HC_OPTS = $(shell echo $(HC_OPTS) | sed -e s@$(odir)/@@g)
+MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS))
 
 MKDEPENDHS=$(HC)
 
@@ -522,6 +551,7 @@ MKDEPENDHS=$(HC)
 depend :: $(HS_SRCS) $(C_SRCS)
        $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
        $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) 
-       $(PERL) -pe 's@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage)
+       $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage)
+# The binmode stuff tells perl not to add stupid ^M's to the output
 
 -include .depend-$(stage)