]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
meson: Resolve the entitlement.sh script once for good
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tue, 15 Feb 2022 16:25:03 +0000 (17:25 +0100)
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tue, 15 Mar 2022 12:36:33 +0000 (13:36 +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.

Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
meson.build

index 351f9f43604a5b9c3d37b73abd4f77b9cf49047d..6e8fa4ab31c567ad4cf81d6090ac0b0fb011c44a 100644 (file)
@@ -3073,6 +3073,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]
@@ -3230,7 +3234,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'],