From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 22 Nov 2019 15:11:41 +0000 (+0100)
Subject: build: in SAMBA_BINARY use TO_LIST(cflags)
X-Git-Tag: tevent-0.11.0~370
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59eac15a4ff17cdb52b2b28b120e3fee4b085b68;p=thirdparty%2Fsamba.git

build: in SAMBA_BINARY use TO_LIST(cflags)

This avoids unfortunate issues when the cflags is
already a list, as then -fPIC becomes ['-f', 'P', 'I', 'C'].

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 2dfd5e6e44b..4fe9daf160e 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -408,10 +408,10 @@ def SAMBA_BINARY(bld, binname, source,
         subsystem_group = group
 
     # only specify PIE flags for binaries
-    pie_cflags = cflags
+    pie_cflags = TO_LIST(cflags)
     pie_ldflags = TO_LIST(ldflags)
     if bld.env['ENABLE_PIE'] is True:
-        pie_cflags += ' -fPIE'
+        pie_cflags.extend(TO_LIST('-fPIE'))
         pie_ldflags.extend(TO_LIST('-pie'))
     if bld.env['ENABLE_RELRO'] is True:
         pie_ldflags.extend(TO_LIST('-Wl,-z,relro,-z,now'))