Skip to content

Commit 8178c37

Browse files
hundebollstephanosio
authored andcommitted
configure: lookup meson exutable from PATH
Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
1 parent c229819 commit 8178c37

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

configure

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -983,12 +983,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
983983
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
984984
${source_path}/pythondeps.toml meson || exit 1
985985

986-
# At this point, we expect Meson to be installed and available.
987-
# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
988-
# We ignore PATH completely here: we want to use the venv's Meson
989-
# *exclusively*.
990-
991-
meson="$(cd pyvenv/bin; pwd)/meson"
986+
meson=`which meson`
992987

993988
# Conditionally ensure Sphinx is installed.
994989

0 commit comments

Comments
 (0)