X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=1dd74cb3c215b1f5de78ee343af5468fbc75a8c3;hb=3fe733ed69f3ffbd60ca42bf88477f2c79321f8b;hp=ddc4032983e00fd51adc8ffef0f40ada9d3669a0;hpb=62d7d2266186a335c42edacfe6bae76b92200e55;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index ddc4032..1dd74cb 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,31 +1,34 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.95 2000/10/12 12:31:11 sewardj Exp $
+# $Id: Makefile,v 1.101 2000/10/27 16:30:02 simonmar Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
 #-----------------------------------------------------------------------------
-# Building hsc different ways (default is just `normal' sequential)
+# Building ghc different ways (default is just `normal' sequential)
 WAYS=$(GhcCompilerWays)
 
 # -----------------------------------------------------------------------------
 #		Set HS_PROG, LIBRARY
 
 # Note: there have been reports of people running up against the ARG_MAX limit
-# when linking hsc with all its constituent object files. The likely source of 
+# when linking ghc with all its constituent object files. The likely source of 
 # the problem is that the environment is a bit too big, so a workaround could
-# be to do ` env PATH=$(PATH) make hsc 'to minimise the environment. (or the
+# be to do ` env PATH=$(PATH) make ghc 'to minimise the environment. (or the
 # equivalent of `env' if it doesn't exist locally).
 #
 ifneq "$(way)" "dll"
-HS_PROG=hsc$(_way)
+HS_PROG=ghc$(_way)-$(ProjectVersion)
 else
-HS_PROG=hsc
+HS_PROG=ghc-$(ProjectVersion)
 endif
 
+LINK = ghc
+
 # -----------------------------------------------------------------------------
 # Create compiler configuration
 
+CURRENT_DIR=ghc/compiler
 CONFIG_HS = main/Config.hs
 boot :: $(CONFIG_HS)
 
@@ -49,7 +52,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
 	@echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
 	@echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS)
-	@echo "cGHC_HSC              = \"$(GHC_HSC)\"" >> $(CONFIG_HS)
 	@echo "cGHC_MANGLER          = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS)
 	@echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS)
 	@echo "cGHC_STATS            = \"$(GHC_STATS)\"" >> $(CONFIG_HS)
@@ -106,9 +108,10 @@ endif
 
 HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
 
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HS_SRCS += rename/ParseIface.hs parser/Parser.hs
-endif
+# ToDo: not clear why this is here -- messes up linking
+#ifneq "$(GhcWithHscBuiltViaC)" "YES"
+#HS_SRCS += rename/ParseIface.hs parser/Parser.hs
+#endif
 
 HCS      = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS)))
 
@@ -143,7 +146,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 # 		Haskell compilations
 
 #
-# Compiler to use for building hsc, use the build tree
+# Compiler to use for building ghc, use the build tree
 # driver when booting.
 #
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
@@ -188,7 +191,6 @@ basicTypes/IdInfo_HC_OPTS 	= -K2m
 codeGen/CgCase_HC_OPTS		= -fno-prune-tydecls
 hsSyn/HsExpr_HC_OPTS 		= -K2m
 main/Main_HC_OPTS 		= 
-main/Constants_HC_OPTS		= -DHscIfaceFileVersion=$(HscIfaceFileVersion)
 
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
 ifeq "$(GhcReportCompiles)" "YES"
@@ -196,7 +198,7 @@ main/Main_HC_OPTS 		+= -syslib misc -DREPORT_TO_MOTHERLODE
 endif
 endif
 
-main/CmdLineOpts_HC_OPTS 	=  -K6m
+main/CmdLineOpts_HC_OPTS 	= -K6m
 nativeGen/PprMach_HC_OPTS 	= -K2m
 nativeGen/MachMisc_HC_OPTS 	= -K2m 
 nativeGen/MachCode_HC_OPTS 	= -H10m
@@ -205,10 +207,12 @@ nativeGen/MachCode_HC_OPTS 	= -H10m
 usageSP/UsageSPInf_HC_OPTS	= -Onot
 
 prelude/PrimOp_HC_OPTS 		= -H12m -K3m
+
+# because the NCG can't handle the 64-bit math in here
 prelude/PrelRules_HC_OPTS	= -fvia-C
 
-parser/Lex_HC_OPTS		= -fvia-C -K2m -H16m 
-parser/Ctype_HC_OPTS		= -K2m -fvia-C
+parser/Lex_HC_OPTS		= -K2m -H16m 
+parser/Ctype_HC_OPTS		= -K2m
 
 rename/ParseIface_HC_OPTS 	+= -Onot -H45m -K2m -fno-warn-incomplete-patterns
 
@@ -249,13 +253,14 @@ typecheck/TcExpr_HC_OPTS	= -H15m
 typecheck/TcBinds_HC_OPTS       = -H10m
 
 typecheck/TcEnv_HC_OPTS		= -H10m
-utils/Argv_HC_OPTS 		= -fvia-C
 utils/SST_HC_OPTS 		= 
 utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS		= -fglasgow-exts 
 utils/DirUtils_HC_OPTS 		= 
 
-# temporary, due to bug in NCG  (SDM, 1/6/2000)
+# temporary, due to bug in NCG (x86 spiller fails because a basic block
+# contains both multiply and divide insns, probably soaking up all spill
+# regs) (SDM, 1/6/2000), augmented by JRS 27 Oct 00.
 utils/FastString_HC_OPTS	= -fvia-C
 
 ifeq "$(alpha_HOST_ARCH)" "1"
@@ -369,14 +374,56 @@ SRC_LD_OPTS += -syslib misc -syslib exts
 endif
 endif
 
+# -----------------------------------------------------------------------------
+# create ghc-inplace, a convenient way to run ghc from the build tree...
+
+all :: ghc-inplace
+
+ghc-inplace : ghc
+	@$(RM) $@
+	echo '#!/bin/sh' >>$@
+	echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
+	chmod 755 $@
+
+CLEAN_FILES += ghc-inplace
+
+# -----------------------------------------------------------------------------
+# Create link to from ghc-x.xx to ghc...
+
+all :: $(LINK)
+
+$(LINK) : $(HS_PROG)
+	@if ( $(PERL) -e '$$fn="$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+	   echo "Creating a symbolic link from $(HS_PROG) to $(LINK)"; \
+	   $(RM) $(LINK); \
+	   $(LN_S) $(HS_PROG) $(LINK); \
+	 else \
+	   echo "Creating a symbolic link from $(HS_PROG) to $(LINK) failed: \`$(LINK)' already exists"; \
+	   echo "Perhaps remove \`$(LINK)' manually?"; \
+	   exit 1; \
+	 fi;
+
+CLEAN_FILES += $(LINK)
+
+install ::
+	@if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+	   echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir)"; \
+	   $(RM) $(bindir)/$(LINK); \
+	   $(LN_S) $(HS_PROG) $(bindir)/$(LINK); \
+	 else \
+	   echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
+	   echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \
+	   exit 1; \
+	 fi;
+
 #-----------------------------------------------------------------------------
 # 		install
 
-# We don't want hsc treated as an ordinary executable,
+# We don't want ghc treated as an ordinary executable,
 # but put it together with the libraries.
 # Also don't want any interface files intstalled
 
-INSTALL_LIBEXECS += hsc
+INSTALL_PROGS += $(HS_PROG)
 
 #-----------------------------------------------------------------------------
 # 		depend