NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite3a8925

committed

meson: windows: Normalize slashes in prefix

This fixes a build issue on windows, when the prefix is set to a path withforward slashes. Windows python defaults to a path with a backslash, but mingwucrt python defaults to a forward slash. This in turn lead to a wrong PATH setduring tests, causing tests to fail.Reported-by: Melih Mutlu <m.melihmutlu@gmail.com>Discussion:http://postgr.es/m/20220928022724.erzuk5v4ai4b53do@awork3.anarazel.de

1 parent2beae72 commite3a8925Copy full SHA for e3a8925

File tree

1 file changed

-3

lines changed

meson.build

1 file changed

-3

lines changed

`‎meson.build‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2733,15 +2733,15 @@ endif`
`2733`	`2733`
`2734`	`2734`	`prefix=get_option('prefix')`
`2735`	`2735`
`2736`		`-test_prefix= prefix`
	`2736`	`+test_prefix=fs.as_posix(prefix)`
`2737`	`2737`
`2738`	`2738`	`if fs.is_absolute(get_option('prefix'))`
`2739`	`2739`	`if host_system=='windows'`
`2740`		`-if prefix.split(':\\').length()==1`
	`2740`	`+if prefix.split(':/').length()==1`
`2741`	`2741`	`# just a drive`
`2742`	`2742`	`test_prefix=''`
`2743`	`2743`	`else`
`2744`		`- test_prefix= prefix.split(':\\')[1]`
	`2744`	`+ test_prefix= prefix.split(':/')[1]`
`2745`	`2745`	`endif`
`2746`	`2746`	`else`
`2747`	`2747`	`assert(prefix.startswith('/'))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite3a8925

File tree

1 file changed

1 file changed

`‎meson.build‎`

0 commit comments