diff --git a/interface/meson.build b/interface/meson.build index 826d7ee04..18abcba12 100644 --- a/interface/meson.build +++ b/interface/meson.build @@ -1,3 +1,7 @@ +interface_args = ['-include', f'@bldroot@/simd_conf.h'] +if not build_without_cblas + interface_args += '-DCBLAS' +endif _blas_roots = [ # NOTE: q, qx, x, xq do not have cblas_ rules in the Makefile # NOTE: https://developer.arm.com/documentation/101004/2310/BLAS-Basic-Linear-Algebra-Subprograms/CBLAS-functions?lang=en @@ -559,7 +563,7 @@ foreach conf : _blas_roots continue endif # Seed with common args - compiler_args = [_cargs] + compiler_args = _cargs + interface_args # Generate the symbol flags base = conf['base'] if symb_defs.has_key(base) diff --git a/meson.build b/meson.build index 065a8b187..b05e06da9 100644 --- a/meson.build +++ b/meson.build @@ -178,7 +178,6 @@ configure_file(output : 'simd_conf.h', configuration : simd_conf_data) # Can't be added as a project argument since it won't be generated until later bldroot = meson.build_root() -_cargs += ['-include', f'@bldroot@/simd_conf.h'] add_project_arguments(simd_cargs, language: 'c') # Common symbol related options @@ -199,9 +198,6 @@ foreach symb : symnames _cargs += f'-U@symb@' endforeach # Based on options -if not build_without_cblas - _cargs += '-DCBLAS' -endif if no_affinity _cargs += '-DNO_AFFINITY' endif