No need to link capstone to targets which don't use it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 disas/meson.build        | 1 -
 target/arm/meson.build   | 1 +
 target/i386/meson.build  | 1 +
 target/ppc/meson.build   | 1 +
 target/s390x/meson.build | 1 +
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/disas/meson.build b/disas/meson.build
index bbfa1197835..4e80adf36ae 100644
--- a/disas/meson.build
+++ b/disas/meson.build
@@ -20,4 +20,3 @@ common_ss.add(when: 'CONFIG_TCG', if_true: files(
 ))
 common_ss.add(files('disas-common.c'))
 system_ss.add(files('disas-mon.c'))
-specific_ss.add(capstone)
diff --git a/target/arm/meson.build b/target/arm/meson.build
index 2e10464dbb6..3d64334657d 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -1,4 +1,5 @@
 arm_ss = ss.source_set()
+arm_ss.add(capstone)
 arm_ss.add(files(
   'cpu.c',
   'debug_helper.c',
diff --git a/target/i386/meson.build b/target/i386/meson.build
index 2e9c472f49d..7d1363ec21f 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -1,4 +1,5 @@
 i386_ss = ss.source_set()
+i386_ss.add(capstone)
 i386_ss.add(files(
   'cpu.c',
   'gdbstub.c',
diff --git a/target/ppc/meson.build b/target/ppc/meson.build
index db3b7a0c33b..b5f509612ec 100644
--- a/target/ppc/meson.build
+++ b/target/ppc/meson.build
@@ -1,4 +1,5 @@
 ppc_ss = ss.source_set()
+ppc_ss.add(capstone)
 ppc_ss.add(files(
   'cpu-models.c',
   'cpu.c',
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index 3b34ae034cb..6e00793944e 100644
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -1,4 +1,5 @@
 s390x_ss = ss.source_set()
+s390x_ss.add(capstone)
 s390x_ss.add(files(
   'cpu.c',
   'cpu_features.c',
-- 
2.47.1

On 1/3/25 15:17, Philippe Mathieu-Daudé wrote:
> No need to link capstone to targets which don't use it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   disas/meson.build        | 1 -
>   target/arm/meson.build   | 1 +
>   target/i386/meson.build  | 1 +
>   target/ppc/meson.build   | 1 +
>   target/s390x/meson.build | 1 +
>   5 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/disas/meson.build b/disas/meson.build
> index bbfa1197835..4e80adf36ae 100644
> --- a/disas/meson.build
> +++ b/disas/meson.build
> @@ -20,4 +20,3 @@ common_ss.add(when: 'CONFIG_TCG', if_true: files(
>   ))
>   common_ss.add(files('disas-common.c'))
>   system_ss.add(files('disas-mon.c'))
> -specific_ss.add(capstone)

You need to think about which hosts require capstone as well,
which is most of them.  This will help almost never.


r~

On 5/1/25 01:57, Richard Henderson wrote:
> On 1/3/25 15:17, Philippe Mathieu-Daudé wrote:
>> No need to link capstone to targets which don't use it.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   disas/meson.build        | 1 -
>>   target/arm/meson.build   | 1 +
>>   target/i386/meson.build  | 1 +
>>   target/ppc/meson.build   | 1 +
>>   target/s390x/meson.build | 1 +
>>   5 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/disas/meson.build b/disas/meson.build
>> index bbfa1197835..4e80adf36ae 100644
>> --- a/disas/meson.build
>> +++ b/disas/meson.build
>> @@ -20,4 +20,3 @@ common_ss.add(when: 'CONFIG_TCG', if_true: files(
>>   ))
>>   common_ss.add(files('disas-common.c'))
>>   system_ss.add(files('disas-mon.c'))
>> -specific_ss.add(capstone)
> 
> You need to think about which hosts require capstone as well,
> which is most of them.  This will help almost never.

Right, good point.