[project @ 2000-10-27 16:30:02 by simonmar]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3ee053b..1dd74cb 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,28 +1,30 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.97 2000/10/27 09:39:35 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
 
@@ -50,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)
@@ -145,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"
@@ -190,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"
@@ -207,7 +207,9 @@ nativeGen/MachCode_HC_OPTS  = -H10m
 usageSP/UsageSPInf_HC_OPTS     = -Onot
 
 prelude/PrimOp_HC_OPTS                 = -H12m -K3m
-prelude/PrelRules_HC_OPTS      = 
+
+# because the NCG can't handle the 64-bit math in here
+prelude/PrelRules_HC_OPTS      = -fvia-C
 
 parser/Lex_HC_OPTS             = -K2m -H16m 
 parser/Ctype_HC_OPTS           = -K2m
@@ -372,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