X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=config%2Fmeson.build;h=7134e80e8ddddeb98dff00307488103dd6dcf5fd;hb=32b4771cd8ef377c039d895d034b3b5e86ee34d2;hp=3f5912fce7a4e71ae9ca121ca61dd6d85e372b8b;hpb=001d402c894627cb2e05927a3923109272009368;p=dpdk.git diff --git a/config/meson.build b/config/meson.build index 3f5912fce7..7134e80e8d 100644 --- a/config/meson.build +++ b/config/meson.build @@ -22,7 +22,8 @@ is_ms_linker = is_windows and (cc.get_id() == 'clang') # depending on the configuration options pver = meson.project_version().split('.') major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) -abi_version = run_command(find_program('cat', 'more'), abi_version_file).stdout().strip() +abi_version = run_command(find_program('cat', 'more'), abi_version_file, + check: true).stdout().strip() # Libraries have the abi_version as the filename extension # and have the soname be all but the final part of the abi_version. @@ -246,10 +247,9 @@ endif add_project_arguments('-include', 'rte_config.h', language: 'c') # enable extra warnings and disable any unwanted warnings +# -Wall is added by default at warning level 1, and -Wextra +# at warning level 2 (DPDK default) warning_flags = [ - # -Wall is added by meson by default, so add -Wextra only - '-Wextra', - # additional warnings in alphabetical order '-Wcast-qual', '-Wdeprecated', @@ -334,7 +334,7 @@ if max_lcores == 'detect' error('Discovery of max_lcores is not supported for cross-compilation.') endif # overwrite the default value with discovered values - max_lcores = run_command(get_cpu_count_cmd).stdout().to_int() + max_lcores = run_command(get_cpu_count_cmd, check: true).stdout().to_int() min_lcores = 2 # DPDK must be built for at least 2 cores if max_lcores < min_lcores @@ -433,7 +433,7 @@ if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 'address dpdk_extra_ldflags += '-lasan' endif - if is_linux and arch_subdir in ['x86', 'arm'] and dpdk_conf.get('RTE_ARCH_64') + if is_linux and dpdk_conf.get('RTE_ARCH_64') dpdk_conf.set10('RTE_MALLOC_ASAN', true) endif endif