From ca9500e08d08f3ddf043af1374350027de769179 Mon Sep 17 00:00:00 2001 From: edvard Date: Tue, 24 Feb 2026 11:13:55 +0100 Subject: [PATCH] meson: removed hard depend on picolibc if not using compiler provided let the users of libcsp override clib --- meson.build | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 145abb472..5c5d44b64 100644 --- a/meson.build +++ b/meson.build @@ -54,12 +54,21 @@ endif csp_deps += yaml_dep conf.set('CSP_HAVE_LIBYAML', yaml_dep.found()) -# Libc dependency -clib = meson.get_compiler('c').find_library('c', required: false) -if not clib.found() - clib = dependency('libc', fallback: ['picolibc', 'picolibc_dep'], required: true) +clib_dep = dependency('libc', required: false) +if not clib_dep.found() + picolib_dep = dependency('', fallback : ['picolibc', 'picolibc_dep'], required : false) + if picolib_dep.found() + error('\n' + + '=======================================================================\n' + + 'Libcsp no longer automatically fetches picolibc. \n' + + 'If you intended to use picolibc, inject it from your main meson.build:\n\n' + + ' picolibc_proj = subproject(\'picolibc\')\n' + + ' meson.override_dependency(\'libc\', picolibc_proj.get_variable(\'picolibc_dep\'))\n' + + '=======================================================================') + endif + clib_dep = meson.get_compiler('c').find_library('c', required: true) endif -csp_deps += clib +csp_deps += clib_dep # Include paths csp_inc = include_directories('include', 'src')