From 3fbfdd08afd2a7a25b27433f6f5678c0fe694721 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 23 Jan 2024 14:07:42 +0100 Subject: [PATCH] libfdt: fix duplicate meson target If default_library is set to static, the libfdt target (which just uses library()) is already static, so we should just use that. This fixes this Meson error: libfdt/meson.build:37:11: ERROR: Tried to create target "fdt", but a target of that name already exists. Signed-off-by: Alyssa Ross Message-ID: <20240123130742.185409-1-hi@alyssa.is> Signed-off-by: David Gibson --- libfdt/meson.build | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libfdt/meson.build b/libfdt/meson.build index 2ea14486..9d07c5f5 100644 --- a/libfdt/meson.build +++ b/libfdt/meson.build @@ -34,19 +34,21 @@ libfdt = library( install: true, ) -libfdt_a = static_library( - 'fdt', sources, - install: true, -) +link_with = libfdt -libfdt_inc = include_directories('.') +if get_option('default_library') != 'static' + libfdt_a = static_library( + 'fdt', sources, + install: true, + ) -if static_build - link_with = libfdt_a -else - link_with = libfdt + if static_build + link_with = libfdt_a + endif endif +libfdt_inc = include_directories('.') + libfdt_dep = declare_dependency( include_directories: libfdt_inc, link_with: link_with,