From 54c680c4ba2bdd53147316a64f46612f667065b5 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 30 Nov 2018 13:57:57 +0000 Subject: [PATCH] Apply work-around for windres bug with msys2 clang also The windres bug with paths with spaces appears irrespective of compiler --- test cases/windows/12 resources with custom targets/meson.build | 2 +- test cases/windows/5 resources/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test cases/windows/12 resources with custom targets/meson.build b/test cases/windows/12 resources with custom targets/meson.build index b1e2b091b..282272d76 100644 --- a/test cases/windows/12 resources with custom targets/meson.build +++ b/test cases/windows/12 resources with custom targets/meson.build @@ -3,7 +3,7 @@ project('winmain', 'c') # MinGW windres has a bug due to which it doesn't parse args with space properly: # https://github.com/mesonbuild/meson/pull/1346 # 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 # because then the -I flag to windres will also have spaces # and we know the test will fail diff --git a/test cases/windows/5 resources/meson.build b/test cases/windows/5 resources/meson.build index ddb7d6e8a..27b2fcc70 100644 --- a/test cases/windows/5 resources/meson.build +++ b/test cases/windows/5 resources/meson.build @@ -3,7 +3,7 @@ project('winmain', 'c') # MinGW windres has a bug due to which it doesn't parse args with space properly: # https://github.com/mesonbuild/meson/pull/1346 # 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 # because then the -I flag to windres will also have spaces # and we know the test will fail