[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/8] meson: Resolve the entitlement.sh script once for good
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 3/8] meson: Resolve the entitlement.sh script once for good |
Date: |
Tue, 15 Feb 2022 18:01:01 +0100 |
Commit 235b523dba ("meson: Use find_program() to resolve the
entitlement.sh script") didn't correctly fixed the issue, as
the script is still resolved for each target. Move the check
earlier, before processing each target.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index df25e7a5e7..287be51ff2 100644
--- a/meson.build
+++ b/meson.build
@@ -2894,6 +2894,10 @@ common_all = static_library('common',
feature_to_c = find_program('scripts/feature_to_c.sh')
+if targetos == 'darwin'
+ entitlement = find_program('scripts/entitlement.sh')
+endif
+
emulators = {}
foreach target : target_dirs
config_target = config_target_mak[target]
@@ -3051,7 +3055,6 @@ foreach target : target_dirs
install_input += meson.current_source_dir() / entitlements
endif
- entitlement = find_program('scripts/entitlement.sh')
emulators += {exe['name'] : custom_target(exe['name'],
input: build_input,
output: exe['name'],
--
2.34.1
- [PATCH v2 0/8] buildsys: More fixes to use GCC on macOS, Philippe Mathieu-Daudé, 2022/02/15
- [PATCH v2 1/8] osdep: Avoid using Clang-specific __builtin_available(), Philippe Mathieu-Daudé, 2022/02/15
- [PATCH v2 3/8] meson: Resolve the entitlement.sh script once for good,
Philippe Mathieu-Daudé <=
- [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Philippe Mathieu-Daudé, 2022/02/15
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Akihiko Odaki, 2022/02/15
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Richard Henderson, 2022/02/16
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Philippe Mathieu-Daudé, 2022/02/16
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Akihiko Odaki, 2022/02/16
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Philippe Mathieu-Daudé, 2022/02/16
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Peter Maydell, 2022/02/16
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Richard Henderson, 2022/02/17
- Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Paolo Bonzini, 2022/02/18
Re: [PATCH v2 4/8] configure: Disable out-of-line atomic operations on Aarch64, Paolo Bonzini, 2022/02/18