diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16086857a7..8e72f895d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -196,6 +196,9 @@ jobs: export PATH=${HOME}/Library/Python/3.8/bin:${HOME}/Library/Python/3.9/bin:${HOME}/.local/bin:${PATH} if [ "$ASAN" == "true" ]; then export CFLAGS="-DASAN=1 ${CFLAGS}" + if [ "$CC" == "clang" ]; then + export LD_LIBRARY_PATH=$(dirname $(clang -print-file-name=libclang_rt.asan-x86_64.so)):${LD_LIBRARY_PATH} + fi fi meson --prefix=${HOME} ${{ matrix.meson_options }} build && ninja -C build env: diff --git a/binrz/rizin/meson.build b/binrz/rizin/meson.build index d07f50f9b1..626bc83cd1 100644 --- a/binrz/rizin/meson.build +++ b/binrz/rizin/meson.build @@ -1,5 +1,4 @@ rizin_exe = executable('rizin', 'rizin.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_util_dep, @@ -27,7 +26,6 @@ rizin_exe = executable('rizin', 'rizin.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) if host_machine.system() == 'darwin' diff --git a/binrz/rz-agent/meson.build b/binrz/rz-agent/meson.build index c52880812f..d006834c6f 100644 --- a/binrz/rz-agent/meson.build +++ b/binrz/rz-agent/meson.build @@ -1,5 +1,4 @@ executable('rz-agent', 'rz-agent.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_util_dep, @@ -10,5 +9,4 @@ executable('rz-agent', 'rz-agent.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-asm/meson.build b/binrz/rz-asm/meson.build index c015142945..6480641410 100644 --- a/binrz/rz-asm/meson.build +++ b/binrz/rz-asm/meson.build @@ -1,5 +1,4 @@ executable('rz-asm', 'rz-asm.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_main_dep, @@ -7,5 +6,4 @@ executable('rz-asm', 'rz-asm.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-ax/meson.build b/binrz/rz-ax/meson.build index b9e65a7ae0..2b23fe19ae 100644 --- a/binrz/rz-ax/meson.build +++ b/binrz/rz-ax/meson.build @@ -1,9 +1,7 @@ executable('rz-ax', 'rz-ax.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [rz_util_dep, rz_main_dep], install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-bin/meson.build b/binrz/rz-bin/meson.build index 437caa0270..0f0b182d84 100644 --- a/binrz/rz-bin/meson.build +++ b/binrz/rz-bin/meson.build @@ -1,5 +1,4 @@ executable('rz-bin', 'rz-bin.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_main_dep, @@ -7,5 +6,4 @@ executable('rz-bin', 'rz-bin.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-diff/meson.build b/binrz/rz-diff/meson.build index 52ad43267f..31a82d93e0 100644 --- a/binrz/rz-diff/meson.build +++ b/binrz/rz-diff/meson.build @@ -1,5 +1,4 @@ executable('rz-diff', 'rz-diff.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_util_dep, @@ -17,5 +16,4 @@ executable('rz-diff', 'rz-diff.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-find/meson.build b/binrz/rz-find/meson.build index ddf853d734..e2ea49de7d 100644 --- a/binrz/rz-find/meson.build +++ b/binrz/rz-find/meson.build @@ -1,5 +1,4 @@ executable('rz-find', 'rz-find.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_main_dep, @@ -13,5 +12,4 @@ executable('rz-find', 'rz-find.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-gg/meson.build b/binrz/rz-gg/meson.build index ddeda92412..055408ab3e 100644 --- a/binrz/rz-gg/meson.build +++ b/binrz/rz-gg/meson.build @@ -1,5 +1,4 @@ executable('rz-gg', 'rz-gg.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_util_dep, @@ -16,5 +15,4 @@ executable('rz-gg', 'rz-gg.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-hash/meson.build b/binrz/rz-hash/meson.build index e164596dd1..bc40822c23 100644 --- a/binrz/rz-hash/meson.build +++ b/binrz/rz-hash/meson.build @@ -1,5 +1,4 @@ executable('rz-hash', 'rz-hash.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_main_dep, @@ -7,5 +6,4 @@ executable('rz-hash', 'rz-hash.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-run/meson.build b/binrz/rz-run/meson.build index b28cda98d8..4a50826f30 100644 --- a/binrz/rz-run/meson.build +++ b/binrz/rz-run/meson.build @@ -1,5 +1,4 @@ executable('rz-run', 'rz-run.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_main_dep, @@ -9,5 +8,4 @@ executable('rz-run', 'rz-run.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-sign/meson.build b/binrz/rz-sign/meson.build index b3c0eaaeca..9cbc382203 100644 --- a/binrz/rz-sign/meson.build +++ b/binrz/rz-sign/meson.build @@ -1,5 +1,4 @@ executable('rz-sign', 'rz-sign.c', - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_util_dep, @@ -11,5 +10,4 @@ executable('rz-sign', 'rz-sign.c', install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) diff --git a/binrz/rz-test/meson.build b/binrz/rz-test/meson.build index ae8c3b213b..9dff8461f0 100644 --- a/binrz/rz-test/meson.build +++ b/binrz/rz-test/meson.build @@ -1,7 +1,6 @@ if get_option('enable_rz_test') executable('rz-test', ['rz-test.c', 'load.c', 'run.c'], - c_args: executable_cflags, include_directories: [platform_inc], dependencies: [ rz_util_dep, @@ -11,6 +10,5 @@ if get_option('enable_rz_test') install: true, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) endif diff --git a/librz/analysis/meson.build b/librz/analysis/meson.build index 6849c71e92..2d162f1cc0 100644 --- a/librz/analysis/meson.build +++ b/librz/analysis/meson.build @@ -250,7 +250,6 @@ rz_analysis_inc = [ rz_analysis = library('rz_analysis', rz_analysis_sources, include_directories: rz_analysis_inc, - c_args: library_cflags, dependencies: [ rz_util_dep, rz_crypto_dep, @@ -271,7 +270,6 @@ rz_analysis = library('rz_analysis', rz_analysis_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/asm/meson.build b/librz/asm/meson.build index aeb0616af2..801ea6d5af 100644 --- a/librz/asm/meson.build +++ b/librz/asm/meson.build @@ -301,7 +301,6 @@ rz_asm_inc = [ rz_asm = library('rz_asm', rz_asm_sources, include_directories: rz_asm_inc, - c_args: library_cflags, dependencies: [ rz_util_dep, rz_config_dep, @@ -315,7 +314,6 @@ rz_asm = library('rz_asm', rz_asm_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/bin/meson.build b/librz/bin/meson.build index 5aa5e82198..c82617c5b0 100644 --- a/librz/bin/meson.build +++ b/librz/bin/meson.build @@ -250,7 +250,7 @@ rz_bin_inc = [platform_inc, include_directories('format')] rz_bin = library('rz_bin', rz_bin_sources, include_directories: rz_bin_inc, - c_args: ['-DRZ_API_BIN_ONLY=1'] + library_cflags, + c_args: ['-DRZ_API_BIN_ONLY=1'], dependencies: [ lz4_dep, yxml_dep, @@ -268,7 +268,6 @@ rz_bin = library('rz_bin', rz_bin_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/bp/meson.build b/librz/bp/meson.build index 06adb65a30..165dc1521d 100644 --- a/librz/bp/meson.build +++ b/librz/bp/meson.build @@ -24,12 +24,10 @@ rz_bp_sources = [ rz_bp = library('rz_bp', rz_bp_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [rz_util_dep], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/config/meson.build b/librz/config/meson.build index 6f92fe97c4..10201955b0 100644 --- a/librz/config/meson.build +++ b/librz/config/meson.build @@ -6,14 +6,12 @@ rz_config_sources = [ rz_config = library('rz_config', rz_config_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [ rz_util_dep ], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/cons/meson.build b/librz/cons/meson.build index 408f7c5c58..b0c9be21d2 100644 --- a/librz/cons/meson.build +++ b/librz/cons/meson.build @@ -19,12 +19,10 @@ rz_cons_sources = [ rz_cons = library('rz_cons', rz_cons_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [rz_util_dep], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/core/meson.build b/librz/core/meson.build index 72b68b79d9..ef7caccd3e 100644 --- a/librz/core/meson.build +++ b/librz/core/meson.build @@ -152,12 +152,10 @@ endif rz_core = library('rz_core', rz_core_sources, include_directories: rz_core_inc, - c_args: library_cflags, dependencies: rz_core_deps, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/crypto/meson.build b/librz/crypto/meson.build index 332c0f804c..fbc67b30a8 100644 --- a/librz/crypto/meson.build +++ b/librz/crypto/meson.build @@ -45,11 +45,9 @@ aes_dep = nettle_proj.get_variable('aes_dep') rz_crypto = library('rz_crypto', rz_crypto_sources, include_directories: [platform_inc], dependencies: [rz_util_dep, aes_dep], - c_args: library_cflags, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/debug/meson.build b/librz/debug/meson.build index de13402521..c408d3109e 100644 --- a/librz/debug/meson.build +++ b/librz/debug/meson.build @@ -130,12 +130,10 @@ rz_debug_inc = [ rz_debug = library('rz_debug', rz_debug_sources, include_directories: rz_debug_inc, - c_args: library_cflags, dependencies: rz_debug_deps, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/demangler/meson.build b/librz/demangler/meson.build index 703a5e0a5a..b22cc43ccf 100644 --- a/librz/demangler/meson.build +++ b/librz/demangler/meson.build @@ -20,12 +20,10 @@ dependencies = [rz_util_dep, libdemangle_dep] rz_demangler = library('rz_demangler', rz_demangler_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: dependencies, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/diff/meson.build b/librz/diff/meson.build index 1d317d46b2..aef3404446 100644 --- a/librz/diff/meson.build +++ b/librz/diff/meson.build @@ -7,12 +7,10 @@ dependencies = [rz_util_dep] rz_diff = library('rz_diff', rz_diff_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: dependencies, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/egg/meson.build b/librz/egg/meson.build index 99b00126bc..2ee187015b 100644 --- a/librz/egg/meson.build +++ b/librz/egg/meson.build @@ -22,7 +22,6 @@ rz_egg_sources = [ rz_egg = library('rz_egg', rz_egg_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [ rz_util_dep, rz_syscall_dep, @@ -32,7 +31,6 @@ rz_egg = library('rz_egg', rz_egg_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/flag/meson.build b/librz/flag/meson.build index 58c41b9560..90c37134de 100644 --- a/librz/flag/meson.build +++ b/librz/flag/meson.build @@ -7,14 +7,12 @@ rz_flag_sources = [ rz_flag = library('rz_flag', rz_flag_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [ rz_util_dep ], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/hash/meson.build b/librz/hash/meson.build index 8416d6f11b..4e2f3450bb 100644 --- a/librz/hash/meson.build +++ b/librz/hash/meson.build @@ -112,12 +112,10 @@ endif rz_hash = library('rz_hash', rz_hash_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: dependencies, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/il/meson.build b/librz/il/meson.build index 40e3707379..51b40d4062 100644 --- a/librz/il/meson.build +++ b/librz/il/meson.build @@ -24,7 +24,6 @@ rz_il_inc = [ rz_il = library('rz_il', rz_il_sources, include_directories: rz_il_inc, - c_args: library_cflags, dependencies: [ rz_util_dep, rz_reg_dep @@ -32,7 +31,6 @@ rz_il = library('rz_il', rz_il_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/io/meson.build b/librz/io/meson.build index fdbacdff14..7d6d7c5a2c 100644 --- a/librz/io/meson.build +++ b/librz/io/meson.build @@ -132,11 +132,9 @@ endif rz_io = library('rz_io', rz_io_sources, include_directories: platform_inc, dependencies: rz_io_deps, - c_args: library_cflags, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/lang/meson.build b/librz/lang/meson.build index 06af4e3259..3916122a72 100644 --- a/librz/lang/meson.build +++ b/librz/lang/meson.build @@ -26,12 +26,10 @@ endif rz_lang = library('rz_lang', rz_lang_sources, include_directories: platform_inc, - c_args: library_cflags, dependencies: [rz_util_dep, rz_cons_dep], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/magic/meson.build b/librz/magic/meson.build index 2f2821db88..156458aad0 100644 --- a/librz/magic/meson.build +++ b/librz/magic/meson.build @@ -19,12 +19,10 @@ endif rz_magic = library('rz_magic', rz_magic_sources, include_directories: platform_inc, - c_args: library_cflags, dependencies: rz_magic_deps, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/main/meson.build b/librz/main/meson.build index 1292dc8344..8c08e26d68 100644 --- a/librz/main/meson.build +++ b/librz/main/meson.build @@ -42,12 +42,10 @@ rz_main_deps = [ rz_main = library('rz_main', rz_main_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: rz_main_deps, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/parse/meson.build b/librz/parse/meson.build index bc84b21142..ecd88fb1ff 100644 --- a/librz/parse/meson.build +++ b/librz/parse/meson.build @@ -45,7 +45,6 @@ rz_parse_sources = [ rz_parse = library('rz_parse', rz_parse_sources, include_directories: platform_inc, - c_args: library_cflags, dependencies: [ rz_util_dep, rz_flag_dep, @@ -56,7 +55,6 @@ rz_parse = library('rz_parse', rz_parse_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/reg/meson.build b/librz/reg/meson.build index b1717bd6a3..fd3825410d 100644 --- a/librz/reg/meson.build +++ b/librz/reg/meson.build @@ -9,12 +9,10 @@ rz_reg_sources = [ rz_reg = library('rz_reg', rz_reg_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [rz_util_dep], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/search/meson.build b/librz/search/meson.build index 164422ae60..7e098f1ea8 100644 --- a/librz/search/meson.build +++ b/librz/search/meson.build @@ -10,12 +10,10 @@ rz_search_sources = [ rz_search = library('rz_search', rz_search_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [rz_util_dep], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/sign/meson.build b/librz/sign/meson.build index 207c644420..83321d8486 100644 --- a/librz/sign/meson.build +++ b/librz/sign/meson.build @@ -22,12 +22,10 @@ rz_sign_deps = [ rz_sign = library('rz_sign', rz_sign_sources, include_directories: rz_sign_inc, - c_args: library_cflags, dependencies: rz_sign_deps, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/socket/meson.build b/librz/socket/meson.build index a6118c5f6f..b1062d849d 100644 --- a/librz/socket/meson.build +++ b/librz/socket/meson.build @@ -26,11 +26,9 @@ endif rz_socket = library('rz_socket', rz_socket_sources, include_directories: [platform_inc], dependencies: dependencies, - c_args: library_cflags, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/syscall/meson.build b/librz/syscall/meson.build index d94fc7d944..5f648234e3 100644 --- a/librz/syscall/meson.build +++ b/librz/syscall/meson.build @@ -4,12 +4,10 @@ rz_syscall_sources = [ rz_syscall = library('rz_syscall', rz_syscall_sources, include_directories: [platform_inc], - c_args: library_cflags, dependencies: [rz_util_dep], install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/type/meson.build b/librz/type/meson.build index 7e07017176..bd4b3f45c6 100644 --- a/librz/type/meson.build +++ b/librz/type/meson.build @@ -27,7 +27,6 @@ rz_type_inc = [ rz_type = library('rz_type', rz_type_sources, include_directories: rz_type_inc, - c_args: library_cflags, dependencies: [ rz_util_dep, tree_sitter_c_dep, @@ -36,7 +35,6 @@ rz_type = library('rz_type', rz_type_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/librz/util/meson.build b/librz/util/meson.build index eb3842eb78..e74697272a 100644 --- a/librz/util/meson.build +++ b/librz/util/meson.build @@ -96,12 +96,10 @@ endif rz_util = library('rz_util', rz_util_sources, include_directories: platform_inc, - c_args: library_cflags, dependencies: rz_util_deps, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - link_args: library_linkflags, soversion: rizin_libversion, version: rizin_version, name_suffix: lib_name_suffix, diff --git a/meson.build b/meson.build index 775e993fb4..2f553dc749 100644 --- a/meson.build +++ b/meson.build @@ -147,19 +147,15 @@ if get_option('default_library') == 'shared' endif endif -executable_cflags = [] -executable_linkflags = [] -library_cflags = ['-DRZ_PLUGIN_INCORE=1'] -library_linkflags = [] +add_project_arguments(['-DRZ_PLUGIN_INCORE=1'], language: 'c') b_sanitize_opt = get_option('b_sanitize') if (b_sanitize_opt.contains('address') or b_sanitize_opt.contains('undefined')) and cc.get_id() == 'clang' - executable_cflags += '-shared-libasan' - executable_linkflags += '-shared-libasan' - library_cflags += '-shared-libasan' - library_linkflags += '-shared-libasan' + add_global_arguments('-shared-libasan', language: 'c') + add_global_link_arguments('-shared-libasan', language: 'c') + add_global_arguments('-shared-libasan', language: 'c', native: true) + add_global_link_arguments('-shared-libasan', language: 'c', native: true) endif - rizin_prefix = get_option('prefix') rizin_bindir = get_option('bindir') rizin_libdir = get_option('libdir') diff --git a/test/integration/meson.build b/test/integration/meson.build index eef90a3fcc..502e2e8ddd 100644 --- a/test/integration/meson.build +++ b/test/integration/meson.build @@ -31,7 +31,6 @@ if get_option('enable_tests') foreach test : tests exe = executable('test_@0@'.format(test), 'test_@0@.c'.format(test), - c_args: executable_cflags, # '.' to find autogenerated "test_config.h" include_directories: [platform_inc, '.'], dependencies: [ @@ -62,7 +61,6 @@ if get_option('enable_tests') install: false, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) test(test, exe, workdir: join_paths(meson.current_source_dir(), '..'), env: unit_test_env, suite: 'integration') endforeach diff --git a/test/unit/auxiliary/meson.build b/test/unit/auxiliary/meson.build index 37299365d1..65b75ab499 100644 --- a/test/unit/auxiliary/meson.build +++ b/test/unit/auxiliary/meson.build @@ -9,8 +9,7 @@ warn_unused_flag = '-Wno-unused-result' auxiliaries = [] foreach file : files auxiliaries += [executable(file, '@0@.c'.format(file), - c_args: executable_cflags + (meson.get_compiler('c').has_argument(warn_unused_flag) ? [warn_unused_flag] : []), + c_args: meson.get_compiler('c').has_argument(warn_unused_flag) ? [warn_unused_flag] : [], install: false, - link_args: executable_linkflags )] endforeach diff --git a/test/unit/meson.build b/test/unit/meson.build index e2cb573bdd..03d7f28ede 100644 --- a/test/unit/meson.build +++ b/test/unit/meson.build @@ -107,7 +107,6 @@ if get_option('enable_tests') foreach test : tests exe = executable('test_@0@'.format(test), 'test_@0@.c'.format(test), - c_args: executable_cflags, include_directories: [platform_inc, '.'], dependencies: [ rz_util_dep, @@ -138,7 +137,6 @@ if get_option('enable_tests') install: false, install_rpath: rpath_exe, implicit_include_directories: false, - link_args: executable_linkflags ) test(test, exe, workdir: join_paths(meson.current_source_dir(), '..'), env: unit_test_env, depends: [auxiliaries, types_files], suite: 'unit') endforeach diff --git a/test/unit/test_str.c b/test/unit/test_str.c index 22138e33fa..ce6c410f5c 100644 --- a/test/unit/test_str.c +++ b/test/unit/test_str.c @@ -225,6 +225,7 @@ bool test_rz_str_split_list(void) { mu_assert_streq(rz_list_get_n(l3, 2), "And", "third item"); mu_assert_streq(rz_list_get_n(l3, 3), "Everyone", "fourth item"); rz_list_free(l3); + mu_end; } bool test_rz_str_split_lines(void) {