File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -54,12 +54,21 @@ endif
5454csp_deps += yaml_dep
5555conf.set(' CSP_HAVE_LIBYAML' , yaml_dep.found())
5656
57- # Libc dependency
58- clib = meson .get_compiler(' c' ).find_library (' c' , required : false )
59- if not clib.found()
60- clib = dependency (' libc' , fallback : [' picolibc' , ' picolibc_dep' ], required : true )
57+ clib_dep = dependency (' libc' , required : false )
58+ if not clib_dep.found()
59+ picolib_dep = dependency ('' , fallback : [' picolibc' , ' picolibc_dep' ], required : false )
60+ if picolib_dep.found()
61+ error (' \n ' +
62+ ' =======================================================================\n ' +
63+ ' Libcsp no longer automatically fetches picolibc. \n ' +
64+ ' If you intended to use picolibc, inject it from your main meson.build:\n\n ' +
65+ ' picolibc_proj = subproject(\' picolibc\' )\n ' +
66+ ' meson.override_dependency(\' libc\' , picolibc_proj.get_variable(\' picolibc_dep\' ))\n ' +
67+ ' =======================================================================' )
68+ endif
69+ clib_dep = meson .get_compiler(' c' ).find_library (' c' , required : true )
6170endif
62- csp_deps += clib
71+ csp_deps += clib_dep
6372
6473# Include paths
6574csp_inc = include_directories (' include' , ' src' )
You can’t perform that action at this time.
0 commit comments