summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-04-02 09:41:07 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-04-05 20:45:12 -0400
commiteac9d3764a35b6c219d74d750bad9d8e790cff77 (patch)
tree617590683d555d7aa1659e34a84924726d6e1987
parent53cf2c047eb2c9251608d85dd0485b645d118ea9 (diff)
downloadhaskell-eac9d3764a35b6c219d74d750bad9d8e790cff77.tar.gz
hadrian: Fix build-stack-nix
As noted by #19589, `stack` is not stateful and therefore must be passed `--nix` on every invocation. Do so. Fixes #19589.
-rwxr-xr-xhadrian/build-stack4
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/build-stack b/hadrian/build-stack
index da069e3575..68f2e31127 100755
--- a/hadrian/build-stack
+++ b/hadrian/build-stack
@@ -7,9 +7,9 @@ STACK="${STACK:-stack}"
# Make sure Hadrian is up-to-date
cd hadrian
-$STACK build --no-library-profiling ${HADRIAN_NIX:+--nix}
+$STACK build --no-library-profiling "${HADRIAN_NIX:+--nix}"
# Run Hadrian in the top-level GHC directory
-$STACK exec hadrian -- \
+$STACK exec hadrian "${HADRIAN_NIX:+--nix}" -- \
--directory ".." \
"$@"