aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build14
1 files changed, 10 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index a7b3c68..0d42de6 100644
--- a/meson.build
+++ b/meson.build
@@ -1586,9 +1586,11 @@ if not get_option('brlapi').auto() or have_system
brlapi = cc.find_library('brlapi', has_headers: ['brlapi.h'],
required: get_option('brlapi'))
if brlapi.found() and not cc.links('''
- #include <brlapi.h>
- #include <stddef.h>
- int main(void) { return brlapi__openConnection (NULL, NULL, NULL); }''', dependencies: brlapi)
+ #include <brlapi.h>
+ #include <stddef.h>
+ int main(void) {
+ return brlapi__openConnection(NULL, NULL, NULL) == BRLAPI_INVALID_FILE_DESCRIPTOR;
+ }''', dependencies: brlapi)
brlapi = not_found
if get_option('brlapi').enabled()
error('could not link brlapi')
@@ -4325,7 +4327,11 @@ foreach target : target_dirs
)
if 'CONFIG_LINUX_USER' in config_target
dir = base_dir / abi
- arch_srcs += files(dir / 'signal.c', dir / 'cpu_loop.c')
+ arch_srcs += files(
+ dir / 'cpu_loop.c',
+ dir / 'elfload.c',
+ dir / 'signal.c',
+ )
if config_target.has_key('TARGET_SYSTBL_ABI')
arch_srcs += \
syscall_nr_generators[abi].process(base_dir / abi / config_target['TARGET_SYSTBL'],