Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4fc5381

Browse files
committed
meson: windows: Fix tmp_install + prefix computation with meson 1.0.1
In d0366bf I said: Instead of trying to do this in meson.build, call out to the implementation meson install uses. This isn't pretty, but it's more reliable than what we had before. Unfortunately it was too ugly - to fix a bug, meson 1.0.1 changed the way the meson internal runpython helper works, resulting in the previous sys.argv[] indices not working anymore. Just open-code it - it's just a few characters longer. Committing this quickly to allow ci/cfbot to work with meson 1.0.1 on windows.
1 parent 05172f1 commit 4fc5381

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2880,10 +2880,10 @@ if build_system != 'windows'
28802880
test_install_location = '@0@@1@'.format(test_install_destdir, dir_prefix)
28812881
else
28822882
# drives, drive-relative paths, etc make this complicated on windows, call
2883-
# meson's logic for it
2883+
# into a copy of meson's logic for it
28842884
command = [
2885-
meson_bin, meson_args, 'runpython', '-c',
2886-
'import sys; from mesonbuild.scripts import destdir_join; print(destdir_join(sys.argv[4], sys.argv[5]))',
2885+
python, '-c',
2886+
'import sys; from pathlib import PurePath; d1=sys.argv[1]; d2=sys.argv[2]; print(str(PurePath(d1, *PurePath(d2).parts[1:])))',
28872887
test_install_destdir, dir_prefix]
28882888
test_install_location = run_command(command, check: true).stdout().strip()
28892889
endif

0 commit comments

Comments
 (0)