diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-06-10 17:38:34 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-11 18:44:20 -0400 |
| commit | aad6115aed884db9ed47ac602ca1bd3b953ea089 (patch) | |
| tree | 990e328ea37396ce878824ea917d3804c2a27e48 /testsuite/mk | |
| parent | 1389b2ccdecb0ea7a8982884512dbf7175a52042 (diff) | |
| download | haskell-aad6115aed884db9ed47ac602ca1bd3b953ea089.tar.gz | |
testsuite/mk/boilerplate.mk: rename 'ghc-config-mk' to 'ghc_config_mk'
Make/shell variable names which contain dashes can cause problems under
some conditions. The 'ghc-config-mk' variable from testsuite/mk/boilerplate.mk
that I made overridable (by Hadrian) in ba0aed2e was working as expected when
our Hadrian/Linux job was based off the deb8 Docker image, but broke when
I switched the job to use our deb9-based image, in 3d97bad6. The exact
circumstances/tool versions that trigger this problem are unknown, but
changing the variable's name to 'ghc_config_mk' lets us work around the issue.
This fixes the annth_compunits and annth_make test failures that showed up
when we switched the Hadrian/Linux job to use the deb9 environment.
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 8 |
1 files changed, 4 insertions, 4 deletions
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] |