summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-11-25 18:33:18 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-12-11 22:40:48 -0500
commitaaa8f00fa03dbc29511283f93fde3b627023f4fe (patch)
tree054db7bc1986c6d5e564cf45ba253db6dc9214ef
parentf9f9f030d77ee6fb882897246a67b527937b8f66 (diff)
downloadhaskell-aaa8f00fa03dbc29511283f93fde3b627023f4fe.tar.gz
Validate script: fix configure command when using stack
-rwxr-xr-xvalidate5
1 files changed, 4 insertions, 1 deletions
diff --git a/validate b/validate
index cea04091ae..0f232f2570 100755
--- a/validate
+++ b/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" ]