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

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 31c6869..d8c3ccc 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
  
@@ -25,8 +28,8 @@ INTERP=perl
 # the make variable names for them here.
 #
 
-WAY_NAMES = $(foreach way,$(ALL_WAYS),WAY_$(way)_NAME)
-WAY_OPTS  = $(foreach way,$(ALL_WAYS),WAY_$(way)_HC_OPTS)
+USER_WAY_NAMES = $(foreach way,$(USER_WAYS),WAY_$(way)_NAME)
+USER_WAY_OPTS  = $(foreach way,$(USER_WAYS),WAY_$(way)_REAL_OPTS)
 
 ifeq "$(INSTALLING)" "1"
 TOP_PWD := $(prefix)
@@ -36,13 +39,14 @@ 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 \
-  $(WAY_NAMES) $(WAY_OPTS)
+  GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN EnableWin32DLLs \
+  CP RM CONTEXT_DIFF LibGmp GhcWithRegisterised \
+  USER_WAY_NAMES USER_WAY_OPTS
 
 #
 # When creating a binary distribution, we prefix the driver script
@@ -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,64 +98,20 @@ 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)
 
 #
-# Option vars for the special ways (that the driver has special pleading for).
-#
-# ToDo: rename -DPROFILING to -D__SCC_PROFILING (or somesuch)
-#              -DTICKY-TICKY TO __TICKY_TICKY__
-#
-#  (this is to make the naming consistent with other `standard' hscpp #defines )
-
-# Way p:
-WAY_p_NAME=profiling
-WAY_p_HC_OPTS+=-fscc-profiling -DPROFILING -optc-DPROFILING
-
-# Way t:
-WAY_t_NAME+=ticky-ticky profiling
-WAY_t_HC_OPTS=-fticky-ticky -DTICKY_TICKY -optc-DTICKY_TICKY
-
-# Way `u':
-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 `mg': 
-#  Q: is passing -D__GRANSIM__ and -DGRAN to hscpp needed? No, just -D__GRANSIM__
-WAY_mg_NAME=GranSim
-WAY_mg_HC_OPTS+=-fstack-check -fconcurrent -fgransim -D__GRANSIM__ -D__CONCURRENT_HASKELL__ -optc-DCONCURRENT -optc-DGRAN
-
-#
-# Ways for different garbage collectors
-#
-WAY_2s_NAME=2-space GC
-WAY_2s_HC_OPTS+=-optc-DGC2s
-
-WAY_1s_NAME=1-space GC
-WAY_1s_HC_OPTS+=-optc-DGC1s
-
-WAY_du_NAME=dual-mode GC
-WAY_du_HC_OPTS+=-optc-DGCdu
+# 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