summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2019-11-22 16:11:41 +0100
committerAndrew Bartlett <abartlet@samba.org>2021-06-15 22:41:34 +0000
commit59eac15a4ff17cdb52b2b28b120e3fee4b085b68 (patch)
treec2d24f63e5c2955d2cf2a5b3ead27e0420a9c691 /buildtools/wafsamba
parentd62917d3d7eeb9c5782d7230a4012b5a9235154f (diff)
downloadsamba-59eac15a4ff17cdb52b2b28b120e3fee4b085b68.tar.gz
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>
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/wafsamba.py4
1 files changed, 2 insertions, 2 deletions
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'))