build: Target c++ arguments specifically where they are needed
This fixes the build with phal enabled, since it tries to add global
project cpp_args after targets have already been declared.
Change-Id: I907fbd40a82725da4e751b82c66c71c602dd2018
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/extensions/openpower-pels/meson.build b/extensions/openpower-pels/meson.build
index 8e1d038..39ea832 100644
--- a/extensions/openpower-pels/meson.build
+++ b/extensions/openpower-pels/meson.build
@@ -31,6 +31,7 @@
extra_sources = []
extra_dependencies = []
+extra_args = []
build_phal = get_option('phal').enabled()
@@ -44,7 +45,12 @@
cpp.find_library('pdbg'),
cpp.find_library('ekb'),
]
- add_project_arguments('-DSBE_FFDC_SUPPORTED', language : ['c','cpp'])
+ extra_args += [
+ '-DSBE_FFDC_SUPPORTED',
+ ]
+ log_manager_ext_args += [
+ '-DSBE_FFDC_SUPPORTED',
+ ]
endif
libpel_sources = files(
@@ -91,6 +97,7 @@
libpel_sources,
'paths.cpp', # paths is separate because it is overridden during test.
include_directories: include_directories('../..', '../../gen'),
+ cpp_args: extra_args,
dependencies: libpel_deps,
)
diff --git a/meson.build b/meson.build
index 7e3099c..68db1cc 100644
--- a/meson.build
+++ b/meson.build
@@ -133,6 +133,7 @@
log_manager_ext_sources = []
log_manager_ext_deps = []
+log_manager_ext_args = []
subdir('extensions')
subdir('phosphor-rsyslog-config')
@@ -165,6 +166,7 @@
log_manager_ext_sources,
'log_manager_main.cpp',
include_directories: include_directories('gen'),
+ cpp_args: log_manager_ext_args,
dependencies: [
log_manager_deps,
log_manager_ext_deps,