diff options
| author | Adam Sandberg Eriksson <adam@sandbergericsson.se> | 2019-01-02 22:08:49 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-27 08:32:12 -0500 |
| commit | 5cb071af5b02b7433b2bb4d06062ac8b6fb387e8 (patch) | |
| tree | 7ac2a837b65e743041eff789e952a732cc6811f9 /hadrian/build.cabal.sh | |
| parent | d0b8a16e388480306c5a07f8bd5172cff84138d4 (diff) | |
| download | haskell-5cb071af5b02b7433b2bb4d06062ac8b6fb387e8.tar.gz | |
hadrian: use new-exec to make sure alex & happy are in PATH (#16120)
Diffstat (limited to 'hadrian/build.cabal.sh')
| -rwxr-xr-x | hadrian/build.cabal.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hadrian/build.cabal.sh b/hadrian/build.cabal.sh index 8c7b59492e..f28c3e0d14 100755 --- a/hadrian/build.cabal.sh +++ b/hadrian/build.cabal.sh @@ -24,7 +24,8 @@ CABVER=( ${CABVERSTR//./ } ) if [ "${CABVER[0]}" -gt 2 -o "${CABVER[0]}" -eq 2 -a "${CABVER[1]}" -ge 2 ]; then "$CABAL" --project-file="$PROJ" new-build $CABFLAGS -j exe:hadrian - "$CABAL" --project-file="$PROJ" new-run $CABFLAGS exe:hadrian -- \ + # use new-exec instead of new-run to make sure that the build-tools (alex & happy) are in PATH + "$CABAL" --project-file="$PROJ" new-exec $CABFLAGS hadrian -- \ --directory "$PWD" \ "$@" else |