commit 8fd187e40db93368fc5635a04d0c940351aa1e5d
author William A. Kennington III <wak@google.com> Mon Jul 26 13:36:56 2021 -0700
committer Jayanth Othayoth <ojayanth@in.ibm.com> Tue Jul 27 03:05:54 2021 -0500
tree 284f0affa142c0a5703237b11c440305688b4b82
parent 5c0c917600eae393494930858fc32b65c3127fd9

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>

extensions/openpower-pels/meson.build

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,
 )