X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=f24a04b4813a1875cada7af0bc2354af4e3046ab;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=31c68692b27f258fdcc04e999bdde2df8da5cb35;hpb=3079b611ef3d3acf3efca8e85f0e3166a8ea27f9;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 31c6869..f24a04b 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -4,6 +4,9 @@
 TOP=..
 CURRENT_DIR=ghc/driver
 include $(TOP)/mk/boilerplate.mk
+#
+# The driver needs to get at the version
+include $(TOP)/mk/version.mk
 
 INSTALLING=0
 
@@ -13,7 +16,7 @@ DYN_LOADABLE_BITS = \
 	ghc-consist.prl \
 	ghc-split.prl
 
-SCRIPT_PROG = ghc-$(GhcProjectVersion)
+SCRIPT_PROG = ghc-$(ProjectVersion)
 SCRIPT_LINK = ghc
 SCRIPT_OBJS = ghc.prl
  
@@ -36,12 +39,13 @@ endif
 
 SCRIPT_SUBST_VARS := \
   INSTALLING \
-  PROJECTNAME PROJECTVERSION PROJECTPATCHLEVEL \
-  CURRENT_DIR TMPDIR HOSTPLATFORM TARGETPLATFORM \
+  ProjectName ProjectVersion ProjectVersionInt ProjectPatchLevel \
+  HscMajorVersion HscMinorVersion CcMajorVersion CcMinorVersion \
+  CURRENT_DIR HOSTPLATFORM TARGETPLATFORM \
   GHC_LIB_DIR GHC_RUNTIME_DIR GHC_UTILS_DIR GHC_INCLUDE_DIR \
   GHC_OPT_HILEV_ASM GhcWithNativeCodeGen LeadingUnderscore\
   GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN \
-  CP RM CONTEXT_DIFF \
+  CP RM CONTEXT_DIFF LibGmp \
   $(WAY_NAMES) $(WAY_OPTS)
 
 #
@@ -53,7 +57,7 @@ SCRIPT_SUBST_VARS := \
 ifeq "$(BIN_DIST)" "1"
 SCRIPT_PREFIX_FILES=prefix.txt
 else
-SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TOP_PWD
+SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TMPDIR TOP_PWD
 endif
 
 all :: $(DYN_LOADABLE_BITS)
@@ -85,7 +89,7 @@ depend :: all
 #
 # Clean up
 #
-CLEAN_FILES += $(SCRIPT_OBJS) $(DYN_LOADABLE_BITS)
+CLEAN_FILES += $(SCRIPT_OBJS) $(SCRIPT_LINK) $(DYN_LOADABLE_BITS) ghc-[0-9].*
 
 #
 # Source distribution
@@ -94,13 +98,23 @@ SRC_DEST_FILES=$(patsubst %.prl,%.lprl,$(DYN_LOADABLE_BITS)) ghc.lprl ordering-p
 
 include $(TOP)/mk/target.mk
 
+ghc.prl : $(TOP)/mk/version.mk
+
 # Hack to re-create the in-situ build tree driver script after 
 # having installed it.
 #
 install ::
 	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) BIN_DIST=0 $(SCRIPT_PROG)
+	@$(MAKE) $(MFLAGS) BIN_DIST=0 INSTALLING=0 $(SCRIPT_PROG)
 
+#
+# Another hack (hmm..I can see a pattern developing here :-)
+# In ghc/driver, we create a symlink from ghc-<whatever-version> to
+# ghc, but we don't want this included in a source distribution.
+# We `solve' this by removing `ghc' from the dist tree here.
+dist ::
+	@echo "Patching dist tree: removing $(SRC_DIST_DIR)/ghc symlink"
+	$(RM) $(SRC_DIST_DIR)/ghc
 
 #
 # Option vars for the special ways (that the driver has special pleading for).
@@ -122,21 +136,9 @@ WAY_t_HC_OPTS=-fticky-ticky -DTICKY_TICKY -optc-DTICKY_TICKY
 WAY_u_NAME=unregisterized (using portable C only)
 WAY_u_HC_OPTS=
 
-# Way `mc': concurrent
-WAY_mc_NAME=concurrent
-WAY_mc_HC_OPTS+=-fstack-check -fconcurrent -D__CONCURRENT_HASKELL__ -optc-DCONCURRENT
-
-# Way `mr': 
-WAY_mr_NAME=profiled concurrent
-WAY_mr_HC_OPTS+=-fstack-check -fconcurrent -fscc-profiling -D__CONCURRENT_HASKELL__ -DPROFILING -optc-DCONCURRENT -optc-DPROFILING
-
-# Way `mt': 
-WAY_mt_NAME=ticky-ticky concurrent
-WAY_mt_HC_OPTS+=-fstack-check -fconcurrent -fticky-ticky -D__CONCURRENT_HASKELL__ -DTICKY-TICKY -optc-DCONCURRENT -optc-DTICKY_TICKY
-
 # Way `mp': 
 WAY_mp_NAME=parallel
-WAY_mp_HC_OPTS+=-fstack-check -fconcurrent -D__PARALLEL_HASKELL__ -optc-DPAR -optc-DCONCURRENT
+WAY_mp_HC_OPTS+=-fstack-check -fparallel -D__PARALLEL_HASKELL__ -optc-DPAR
 
 #
 # Way `mg':