Skip to content

Commit 7e8d832

Browse files
authored
Merge pull request #37 from spaceinventor/allow_any_libc
meson: removed hard depend on picolibc if not using compiler provided
2 parents 57c5c48 + ca9500e commit 7e8d832

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

meson.build

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,21 @@ endif
5454
csp_deps += yaml_dep
5555
conf.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)
6170
endif
62-
csp_deps += clib
71+
csp_deps += clib_dep
6372

6473
# Include paths
6574
csp_inc = include_directories('include', 'src')

0 commit comments

Comments
 (0)