diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-03 13:52:03 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-07 14:06:16 -0500 |
| commit | 5b35ca58d94d07751ef2f810686f588ce9c0878a (patch) | |
| tree | a9445b8802aed1cd46548cae5d3d33176dccd5fe /libraries | |
| parent | 7bfae2ee0e9548f489c52c0e3f4688a9ae83b12b (diff) | |
| download | haskell-5b35ca58d94d07751ef2f810686f588ce9c0878a.tar.gz | |
Fix gen_contents_index logic for hadrian bindist
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/gen_contents_index | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index index 29be2e13f9..1efd5eb157 100644 --- a/libraries/gen_contents_index +++ b/libraries/gen_contents_index @@ -32,7 +32,18 @@ then [ -d dist-haddock ] || mkdir dist-haddock cd dist-haddock - HADDOCK=../../inplace/bin/haddock + if [ -e ../../inplace/bin/haddock ] + then + # Make #17527 + HADDOCK=../../inplace/bin/haddock + elif [ -e ../../../../../bin/haddock ] + then + # Hadrian + HADDOCK=../../../../../bin/haddock + else + echo "Haddock not found" + exit 1 + fi # Exclude Cabal package-tests, which may run haddock HADDOCK_FILES=`find ../ -name *.haddock | grep -v 'PackageTests' | sort` HADDOCK_ARGS="-p ../prologue.txt" |