Merge branch '3120-libelf-disabling' into 'main'

build: Fix -Dlibelf=disabled on Linux

Closes #3120

See merge request GNOME/glib!3648
This commit is contained in:
Michael Catanzaro 2023-10-17 14:18:15 +00:00
commit 6ad6180b3c

View File

@ -935,7 +935,7 @@ endif
# Dependencies used by executables below # Dependencies used by executables below
have_libelf = false have_libelf = false
libelf = dependency('libelf', version : '>= 0.8.12', required : false) libelf = dependency('libelf', version : '>= 0.8.12', required : false)
if libelf.found() if libelf.found() and get_option('libelf').allowed()
have_libelf = true have_libelf = true
else else
# This fallback is necessary on *BSD. elfutils isn't the only libelf # This fallback is necessary on *BSD. elfutils isn't the only libelf