| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 5293d0f5067b2aeefe9ce3c175c972de367589bc Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 13 Feb 2019 17:43:54 +0100 |
| 4 | Subject: [PATCH] modules/windows: split WINDRES env variable |
| 5 | |
| 6 | As it may contain not just the binary, but also the arguments to it. |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 10 | --- |
| 11 | mesonbuild/modules/windows.py | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py |
| 15 | index d185d89..dbaeb9b 100644 |
| 16 | --- a/mesonbuild/modules/windows.py |
| 17 | +++ b/mesonbuild/modules/windows.py |
| 18 | @@ -56,7 +56,7 @@ class WindowsModule(ExtensionModule): |
| 19 | if 'WINDRES' in os.environ: |
| 20 | # Pick-up env var WINDRES if set. This is often used for |
| 21 | # specifying an arch-specific windres. |
| 22 | - rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES'), silent=True) |
| 23 | + rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES').split(), silent=True) |
| 24 | |
| 25 | if not rescomp or not rescomp.found(): |
| 26 | # Take windres from the config file after the environment, which is |