[Git][ghc/ghc][master] Validate script: fix configure command when using stack

[Marge Bot]

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


Commits:
aaa8f00f by Sylvain Henry at 2020-12-11T22:40:48-05:00
Validate script: fix configure command when using stack

- - - - -


1 changed file:

- validate


Changes:

=====================================
validate
=====================================
@@ -145,6 +145,8 @@ fi
 
 echo "using THREADS=${threads}" >&2
 
+configure_cmd="./configure"
+
 if [ "$use_hadrian" = "NO" ]
 then
     make="gmake"
@@ -173,6 +175,7 @@ else
         hadrian/build-stack --help > /dev/null
         cd hadrian
         hadrian_cmd=$(stack exec -- which hadrian)
+        configure_cmd="stack --stack-yaml hadrian/stack.yaml exec -- ./configure"
     fi
     cd ..
     # TODO: define a hadrian Flavour that mimics
@@ -199,7 +202,7 @@ if [ $testsuite_only -eq 0 ]; then
         INSTDIR="$thisdir/inst"
 
         python3 ./boot --validate
-        ./configure --prefix="$INSTDIR" $config_args
+        $configure_cmd --prefix="$INSTDIR" $config_args
     fi
 
     if [ "$use_hadrian" = "NO" ]



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/aaa8f00fa03dbc29511283f93fde3b627023f4fe
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/20201211/a8d0ed6b/attachment.html>