diff options
| -rw-r--r-- | hadrian/src/Rules/Test.hs | 2 | ||||
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs index 6a010df45a..f5d0dd53b6 100644 --- a/hadrian/src/Rules/Test.hs +++ b/hadrian/src/Rules/Test.hs @@ -122,7 +122,7 @@ testRules = do -- This lets us bypass the need to generate a config -- through Make, which happens in testsuite/mk/boilerplate.mk -- which is in turn included by all test 'Makefile's. - setEnv "ghc-config-mk" (top -/- root -/- ghcConfigPath) + setEnv "ghc_config_mk" (top -/- root -/- ghcConfigPath) -- Execute the test target. -- We override the verbosity setting to make sure the user can see diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 3dc84f02e0..7eb89d9785 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -240,17 +240,17 @@ $(TOP)/mk/ghc-config : $(TOP)/mk/ghc-config.hs empty= space=$(empty) $(empty) -ifeq "$(ghc-config-mk)" "" -ghc-config-mk = $(TOP)/mk/ghcconfig$(subst $(space),_,$(subst :,_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk +ifeq "$(ghc_config_mk)" "" +ghc_config_mk = $(TOP)/mk/ghcconfig$(subst $(space),_,$(subst :,_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk -$(ghc-config-mk) : $(TOP)/mk/ghc-config +$(ghc_config_mk) : $(TOP)/mk/ghc-config $(TOP)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) "$@"; exit 1; fi # If the ghc-config fails, remove $@, and fail endif # Note: $(CLEANING) is not defined in the testsuite. ifeq "$(findstring clean,$(MAKECMDGOALS))" "" --include $(ghc-config-mk) +-include $(ghc_config_mk) endif # Note [WayFlags] |