@@ -7,9 +7,6 @@ ninja = find_program('ninja', 'make', required: false)
77sleef_build_dir = ' sleef_build'
88sleef_install_dir = ' sleef_install'
99
10- # Dynamically set libdir based on platform conventions
11- libdir = ' lib'
12-
1310# Configure SLEEF at configuration time
1411sleef_configure = run_command ([
1512 cmake,
@@ -39,8 +36,10 @@ sleef_build_target = custom_target('sleef_build',
3936
4037# Path variables
4138sleef_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+ ]
4443# Create a dependency that ensures the build happens but doesn't link the dummy file
4544sleef_build_dep = declare_dependency (sources : [sleef_build_target])
4645
@@ -58,11 +57,11 @@ endif
5857sleef_dep = declare_dependency (
5958 dependencies : [sleef_build_dep], # Ensures build happens first
6059 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' ]
6261)
6362
6463sleefquad_dep = declare_dependency (
6564 dependencies : [sleef_build_dep], # Ensures build happens first
6665 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' ]
6867)
0 commit comments