rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: windows: Normalize slashes in prefix 

This fixes a build issue on windows, when the prefix is set to a path with
forward slashes. Windows python defaults to a path with a backslash, but mingw
ucrt python defaults to a forward slash. This in turn lead to a wrong PATH set
during tests, causing tests to fail.

Reported-by: Melih Mutlu <m.melihmutlu@gmail.com>
Discussion: http://postgr.es/m/20220928022724.erzuk5v4ai4b53do@awork3.anarazel.de
This commit is contained in:
Andres Freund 2022-09-27 11:55:00 -07:00
parent 2beae72746
commit e3a892539b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -2733,15 +2733,15 @@ endif
prefix = get_option('prefix')
test_prefix = prefix
test_prefix = fs.as_posix(prefix)
if fs.is_absolute(get_option('prefix'))
if host_system == 'windows'
if prefix.split(':\\').length() == 1
if prefix.split(':/').length() == 1
# just a drive
test_prefix = ''
else
test_prefix = prefix.split(':\\')[1]
test_prefix = prefix.split(':/')[1]
endif
else
assert(prefix.startswith('/'))