@@ -7,9 +7,6 @@ ninja = find_program('ninja', 'make', required: false)
7
7
sleef_build_dir = ' sleef_build'
8
8
sleef_install_dir = ' sleef_install'
9
9
10
- # Dynamically set libdir based on platform conventions
11
- libdir = ' lib'
12
-
13
10
# Configure SLEEF at configuration time
14
11
sleef_configure = run_command ([
15
12
cmake,
@@ -39,8 +36,10 @@ sleef_build_target = custom_target('sleef_build',
39
36
40
37
# Path variables
41
38
sleef_include_path = meson .current_build_dir() / sleef_install_dir / ' include'
42
- sleef_lib_path = meson .current_build_dir() / sleef_install_dir / libdir
43
-
39
+ sleef_lib_paths = [
40
+ meson .current_build_dir() / sleef_install_dir / ' lib' ,
41
+ meson .current_build_dir() / sleef_install_dir / ' lib64'
42
+ ]
44
43
# Create a dependency that ensures the build happens but doesn't link the dummy file
45
44
sleef_build_dep = declare_dependency (sources : [sleef_build_target])
46
45
@@ -58,11 +57,11 @@ endif
58
57
sleef_dep = declare_dependency (
59
58
dependencies : [sleef_build_dep], # Ensures build happens first
60
59
compile_args : compile_args_list,
61
- link_args : [' -L' + sleef_lib_path, ' -lsleef' ]
60
+ link_args : [' -L' + p for p in sleef_lib_paths] + [ ' -lsleef' ]
62
61
)
63
62
64
63
sleefquad_dep = declare_dependency (
65
64
dependencies : [sleef_build_dep], # Ensures build happens first
66
65
compile_args : compile_args_list,
67
- link_args : [' -L' + sleef_lib_path, ' -lsleefquad' ]
66
+ link_args : [' -L' + p for p in sleef_lib_paths] + [ ' -lsleefquad' ]
68
67
)
0 commit comments