fix for variant 1 in combi with use of ruler

uhc · Jan 18, 2012 · 26056d2 · 26056d2
1 parent f417787
commit 26056d2
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/EHC/mk/shared.mk.in b/EHC/mk/shared.mk.in
@@ -75,6 +75,7 @@ EHC_UHC_INSTALL_VARIANT			:= 101
 EHC_PREL_VARIANTS				:= $(EHC_PREL_VARIANT) $(EHC_UHC_VARIANT) $(EHC_UHC_INSTALL_VARIANT)
 EHC_GMP_VARIANTS				:= $(EHC_PREL_VARIANTS) 97 98 $(EHC_OTHER_CODE_VARIANTS)
 EHC_LTM_VARIANTS				:= $(EHC_GMP_VARIANTS)
+EHC_PUB_RULER_VARIANTS			:= 1 2 3 4
 EHC_PUB_NOCODE_VARIANTS			:= 1 2 3 4 5 6 7
 EHC_PUB_NOPREL_VARIANTS			:= 8 9 10 11 12 13 14 15 17 18 19 20 30 31 50 90 91 92 93 96 97 98
 EHC_PUB_CODE_VARIANTS			:= $(EHC_PUB_NOPREL_VARIANTS) $(EHC_PREL_VARIANTS)
@@ -100,6 +101,12 @@ TEST_VARIANTS					:= $(EHC_PUB_NOCODE_VARIANTS) 8 9 10 11 $(EHC_PREL_VARIANT)
 
 EXIT_IF_ABSENT_LIB_OR_TOOL		:= @EXIT_IF_ABSENT_LIB_OR_TOOL@
 
+###########################################################################################
+# use of ruler depents on variant
+###########################################################################################
+
+EHC_CFG_USE_RULER						:= $(filter $(EHC_VARIANT),$(EHC_PUB_RULER_VARIANTS))
+
 ###########################################################################################
 # rts building depends on target
 ###########################################################################################

diff --git a/EHC/src/ehc/files1.mk b/EHC/src/ehc/files1.mk
@@ -120,6 +120,7 @@ $(patsubst $(SRC_EHC_PREFIX)%.cag,$(EHC_BLD_LIB_HS_VARIANT_PREFIX)%.hs,$(EHC_EH_
 EHC_ALL_CHUNK_SRC						:= $(EHC_AG_ALL_MAIN_SRC_CAG) $(EHC_AG_ALL_DPDS_SRC_CAG) $(EHC_HS_ALL_SRC_CHS)
 EHC_ALL_SRC								:= $(EHC_ALL_CHUNK_SRC) $(EHC_RULES_ALL_SRC) $(EHC_MKF)
 EHC_ALL_SRC_FIND						:= $(shell find $(call FUN_PREFIX2DIR,$(SRC_EHC_PREFIX)) \( -name '*.chs' -or -name '*.cag' \))
+EHC_ALL_SRC_GEN							:= $(if $(EHC_CFG_USE_RULER),$(EHC_RULES_3_DRV_CAG),)
 
 # distribution
 EHC_DIST_FILES							:= $(EHC_ALL_SRC)
@@ -360,7 +361,7 @@ $(INSABS_EHC_LIB_ALL_AG): $(INSTALLABS_VARIANT_LIB_AG_PREFIX)%: $(EHC_BLD_LIB_HS
 ###########################################################################################
 
 # rules for ehc library sources+derived
-$(EHC_AG_ALL_MAIN_DRV_AG) $(EHC_AG_ALL_DPDS_DRV_AG): $(EHC_BLD_LIB_HS_VARIANT_PREFIX)%.ag: $(SRC_EHC_PREFIX)%.cag $(SHUFFLE) # $(MK_CONFIG_MKF)
+$(EHC_AG_ALL_MAIN_DRV_AG) $(EHC_AG_ALL_DPDS_DRV_AG): $(EHC_BLD_LIB_HS_VARIANT_PREFIX)%.ag: $(SRC_EHC_PREFIX)%.cag $(SHUFFLE)
 	mkdir -p $(@D)
 	$(SHUFFLE_AG) $(LIB_EHC_SHUFFLE_DEFS) $(SHUFFLE_OPTS_WHEN_EHC) $(EHC_SHUFFLE_OPTS_WHEN_UHC_$(EHC_VARIANT)) --gen-reqm="($(EHC_VARIANT) $(EHC_ASPECTS))" --base=$(*F)  --variant-order="$(EHC_SHUFFLE_ORDER)" $< > $@&& \
 	touch $@
@@ -372,7 +373,7 @@ $(EHC_RULES_3_DRV_AG): $(EHC_BLD_VARIANT_ASPECTS_PREFIX)%.ag: $(EHC_BLD_VARIANT_
 $(EHC_AG_D_MAIN_DRV_HS) $(LIB_EHC_AG_D_MAIN_DRV_HS): %.hs: %.ag
 	$(AGC) -dr $(UUAGC_OPTS_WHEN_EHC) $(UUAGC_OPTS_WHEN_EHC_AST_DATA) $(EHC_UUAGC_OPTS_WHEN_UHC_AST_DATA_$(EHC_VARIANT)) -P$(EHC_BLD_VARIANT_ASPECTS_PREFIX) -P$(EHC_BLD_LIB_HS_VARIANT_PREFIX) $<
 
-$(EHC_AG_S_MAIN_DRV_HS) $(LIB_EHC_AG_S_MAIN_DRV_HS): %.hs: %.ag
+$(EHC_AG_S_MAIN_DRV_HS) $(LIB_EHC_AG_S_MAIN_DRV_HS): %.hs: %.ag $(if $(EHC_CFG_USE_RULER),$(EHC_RULES_3_DRV_AG),)
 	$(AGC) -cfspr $(UUAGC_OPTS_WHEN_EHC) $(UUAGC_OPTS_WHEN_EHC_AST_SEM) $(EHC_UUAGC_OPTS_WHEN_UHC_AST_SEM_$(EHC_VARIANT)) -P$(EHC_BLD_VARIANT_ASPECTS_PREFIX) -P$(EHC_BLD_LIB_HS_VARIANT_PREFIX) $<
 	touch $@
 

diff --git a/EHC/src/ehc/files2.mk b/EHC/src/ehc/files2.mk
@@ -7,7 +7,11 @@ $(patsubst %,%/ehc,$(EHC_VARIANTS)): %/ehc: $(call FUN_EHC_INSTALL_VARIANT_ASPEC
 #$(patsubst $(BIN_PREFIX)%$(EXEC_SUFFIX),%,$(EHC_ALL_EXECS)): %: $(BIN_PREFIX)%$(EXEC_SUFFIX)
 
 # for (e.g.) install/99/bin/ehc, ehc binaries
-$(EHC_ALL_EXECS): %: $(EHC_ALL_SRC_FIND) $(EHC_MKF) $(RTS_ALL_SRC)
+$(EHC_ALL_EXECS): %: \
+		$(EHC_ALL_SRC_FIND) \
+		$(if $(EHC_CFG_USE_RULER),$(RULER2),) \
+		$(EHC_MKF) \
+		$(RTS_ALL_SRC)
 	@$(EXIT_IF_ABSENT_LIB_OR_TOOL)
 	$(MAKE) INCLUDE_DERIVED_MK=yes EHC_VARIANT=`echo $@ | sed -n -e 's+$(call FUN_EHC_INSTALL_VARIANT_ASPECTS_EXEC,\([0-9_]*\)).*+\1+p'` ehc-variant
 
@@ -39,18 +43,23 @@ $(patsubst %,%/clean,$(EHC_VARIANTS)):
 ###########################################################################################
 
 lib-eh-variant: 
-	$(MAKE) EHC_VARIANT_RULER_SEL="(($(EHC_VARIANT)=$(EHC_ON_RULES_VIEW_$(EHC_VARIANT)))).($(EHC_BY_RULER_GROUPS_BASE)).($(EHC_BY_RULER_RULES_$(EHC_VARIANT)))" \
+	$(MAKE) \
+	  $(if $(EHC_CFG_USE_RULER),EHC_VARIANT_RULER_SEL="(($(EHC_VARIANT)=$(EHC_ON_RULES_VIEW_$(EHC_VARIANT)))).($(EHC_BY_RULER_GROUPS_BASE)).($(EHC_BY_RULER_RULES_$(EHC_VARIANT)))",) \
 	  $(LIB_EHC_INS_FLAG)
 
 ###########################################################################################
 # rules for ehc compiler
 ###########################################################################################
 
 ehc-variant:
-	$(MAKE) EHC_VARIANT_RULER_SEL="(($(EHC_VARIANT)=$(EHC_ON_RULES_VIEW_$(EHC_VARIANT)))).($(EHC_BY_RULER_GROUPS_BASE)).($(EHC_BY_RULER_RULES_$(EHC_VARIANT)))" \
+	$(MAKE) \
+	  $(if $(EHC_CFG_USE_RULER),EHC_VARIANT_RULER_SEL="(($(EHC_VARIANT)=$(EHC_ON_RULES_VIEW_$(EHC_VARIANT)))).($(EHC_BY_RULER_GROUPS_BASE)).($(EHC_BY_RULER_RULES_$(EHC_VARIANT)))",) \
 	  ehc-variant-dflt
 
-ehc-variant-dflt: $(EHC_ALL_DPDS) $(LIB_EH_UTIL_INS_FLAG) $(LIB_EHC_INS_FLAG)
+ehc-variant-dflt: \
+		$(EHC_ALL_DPDS) \
+		$(LIB_EH_UTIL_INS_FLAG) \
+		$(LIB_EHC_INS_FLAG)
 	mkdir -p $(dir $(EHC_INSTALL_VARIANT_ASPECTS_EXEC)) && \
 	$(GHC) --make $(GHC_OPTS) $(GHC_OPTS_WHEN_EHC) -package $(LIB_EH_UTIL_PKG_NAME) -package $(LIB_EHC_PKG_NAME) \
 	       -i$(EHC_BLD_VARIANT_ASPECTS_PREFIX) $(EHC_BLD_VARIANT_ASPECTS_PREFIX)$(EHC_MAIN).hs -o $(EHC_INSTALL_VARIANT_ASPECTS_EXEC)
@@ -99,7 +108,8 @@ $(call FUN_INSTALL_VARIANT_BIN_PREFIX,$(EHC_VARIANT))llvmc: $(BIN_PREFIX)llvmc
 ###########################################################################################
 
 ehc-haddock-variant: 
-	$(MAKE) EHC_VARIANT_RULER_SEL="(($(EHC_VARIANT)=$(EHC_ON_RULES_VIEW_$(EHC_VARIANT)))).($(EHC_BY_RULER_GROUPS_BASE)).($(EHC_BY_RULER_RULES_$(EHC_VARIANT)))" \
+	$(MAKE) \
+	  $(if $(EHC_CFG_USE_RULER),EHC_VARIANT_RULER_SEL="(($(EHC_VARIANT)=$(EHC_ON_RULES_VIEW_$(EHC_VARIANT)))).($(EHC_BY_RULER_GROUPS_BASE)).($(EHC_BY_RULER_RULES_$(EHC_VARIANT)))",) \
 	  ehc-haddock-variant-dflt
 
 ehc-haddock-variant-dflt: $(EHC_ALL_DPDS) $(LIB_EH_UTIL_HS_DRV)

diff --git a/EHC/src/ehc/variant.mk b/EHC/src/ehc/variant.mk
@@ -6,7 +6,16 @@
 # aspects, EHC_ASPECTS to be configured at top level, for now here
 ###########################################################################################
 
-EHC_ASPECTS								:= $(if $(ASPECTS),$(ASPECTS),base hmtyinfer codegen grin noHmTyRuler $(if $(ENABLE_JAVA),java jazy,) $(if $(ENABLE_LLVM),llvm,) $(if $(ENABLE_JSCRIPT),jscript,) $(if $(ENABLE_CLR),clr,) $(if $(ENABLE_TYCORE),tycore,) $(if $(ENABLE_TAUPHI),tauphi,))
+EHC_ASPECTS								:= $(strip $(if $(ASPECTS),$(ASPECTS) \
+											,base hmtyinfer codegen grin  \
+											 $(if $(EHC_CFG_USE_RULER),,noHmTyRuler) \
+											 $(if $(ENABLE_JAVA),java jazy,) \
+											 $(if $(ENABLE_LLVM),llvm,) \
+											 $(if $(ENABLE_JSCRIPT),jscript,) \
+											 $(if $(ENABLE_CLR),clr,) \
+											 $(if $(ENABLE_TYCORE),tycore,) \
+											 $(if $(ENABLE_TAUPHI),tauphi,) \
+											))
 EHC_ASPECTS_SUFFIX						:= $(if $(ASPECTS),-$(subst $(space),-,$(ASPECTS)),)
 EHC_ASPECTS_SUFFIX2						:= $(subst -,,$(EHC_ASPECTS_SUFFIX))