Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply work-around for windres bug with msys2 clang also 

The windres bug with paths with spaces appears irrespective of compiler
This commit is contained in:
Jon Turney 2018-11-30 13:57:57 +00:00
parent 272623c5a3
commit 54c680c4ba
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test cases/windows/12 resources with custom targets/meson.build
View File

@ -3,7 +3,7 @@ project('winmain', 'c')
# MinGW windres has a bug due to which it doesn't parse args with space properly: # MinGW windres has a bug due to which it doesn't parse args with space properly:
# https://github.com/mesonbuild/meson/pull/1346 # https://github.com/mesonbuild/meson/pull/1346
# https://sourceware.org/bugzilla/show_bug.cgi?id=4933 # https://sourceware.org/bugzilla/show_bug.cgi?id=4933
if meson.get_compiler('c').get_id() == 'gcc' and host_machine.system() == 'windows' if ['gcc', 'clang'].contains(meson.get_compiler('c').get_id()) and host_machine.system() == 'windows'
# Construct build_to_src and skip this test if it has spaces # Construct build_to_src and skip this test if it has spaces
# because then the -I flag to windres will also have spaces # because then the -I flag to windres will also have spaces
# and we know the test will fail # and we know the test will fail

2
test cases/windows/5 resources/meson.build
View File

@ -3,7 +3,7 @@ project('winmain', 'c')
# MinGW windres has a bug due to which it doesn't parse args with space properly: # MinGW windres has a bug due to which it doesn't parse args with space properly:
# https://github.com/mesonbuild/meson/pull/1346 # https://github.com/mesonbuild/meson/pull/1346
# https://sourceware.org/bugzilla/show_bug.cgi?id=4933 # https://sourceware.org/bugzilla/show_bug.cgi?id=4933
if meson.get_compiler('c').get_id() == 'gcc' and host_machine.system() == 'windows' if ['gcc', 'clang'].contains(meson.get_compiler('c').get_id()) and host_machine.system() == 'windows'
# Construct build_to_src and skip this test if it has spaces # Construct build_to_src and skip this test if it has spaces
# because then the -I flag to windres will also have spaces # because then the -I flag to windres will also have spaces
# and we know the test will fail # and we know the test will fail