From 2e6bc2ab40f5edc90497828a41c1cd67478e6b85 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 15 Jun 2020 07:18:23 +0200
Subject: build: Do not convert cflags to defines

This makes it possible to use module-specific C flags, for example to
instrument functions (-finstrument-functions).
---
 waf_libbsd.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/waf_libbsd.py b/waf_libbsd.py
index 9ac5bf35..a817e574 100644
--- a/waf_libbsd.py
+++ b/waf_libbsd.py
@@ -443,19 +443,11 @@ class Builder(builder.ModuleManager):
             for arch in archs:
                 if bld.get_env()['RTEMS_ARCH'] == arch:
                     bld_sources += Builder._sourceList(bld, build[arch])
-            if 'cflags' in build:
-                bld_defines = [d[2:] for d in build['cflags']]
-            else:
-                bld_defines = []
-            if 'includes' in build:
-                bld_includes = build['includes']
-            else:
-                bld_includes = []
             bld.objects(target = target,
                         features = 'c',
-                        cflags = cflags,
-                        includes = sorted(bld_includes) + includes,
-                        defines = defines + sorted(bld_defines),
+                        cflags = cflags + sorted(build.get('cflags', [])),
+                        includes = sorted(build.get('includes', [])) + includes,
+                        defines = defines,
                         source = bld_sources)
             libbsd_use += [target]
 
-- 
cgit v1.2.3