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 /hadrian | |
| 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 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/Test.hs | 2 |
1 files changed, 1 insertions, 1 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 |