[Git][ghc/ghc][master] Find hadrian location more reliably in cabal-install output

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
fc963932 by Greg Steuck at 2020-11-20T02:10:31-05:00
Find hadrian location more reliably in cabal-install output

Fix #18944

- - - - -


1 changed file:

- validate


Changes:

=====================================
validate
=====================================
@@ -165,7 +165,7 @@ else
     then
         hadrian/build --help > /dev/null
         cd hadrian
-        hadrian_cmd=$(cabal new-exec -- which hadrian)
+        hadrian_cmd=$(cabal new-exec -- which hadrian | grep 'hadrian$')
     else
         if [ $no_clean -eq 0 ]; then
             rm -rf hadrian/.stack-work



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fc963932018ccf5445613ec0932d726b51887769

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fc963932018ccf5445613ec0932d726b51887769
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201120/1b4f7d22/attachment.html>