summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-03-22 13:06:43 +1100
committerStefan Metzmacher <metze@samba.org>2013-03-25 10:23:00 +0100
commit7dc6dfd90c5182ed85042b22d4864d3e9b007531 (patch)
tree4a42c9c9eea4cbfc271183f82df30317a2d548c7
parentd27f00cd4cd14b7729861121ed221e3cf2ecf9ba (diff)
downloadsamba-7dc6dfd90c5182ed85042b22d4864d3e9b007531.tar.gz
samba-7dc6dfd90c5182ed85042b22d4864d3e9b007531.tar.bz2
samba-7dc6dfd90c5182ed85042b22d4864d3e9b007531.zip
build: Remove the forced use of only the first part of the compiler string
This corrects parts of 378295c3fe813c70815a14c7de608e4a859bd6cc and 301d59caf2ee6f49e108b748b0e38221dec9bb96. This is seen if CC="ccache gcc" and CPP isn't used for some reason. Andrew Bartlett Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--buildtools/wafsamba/samba_pidl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index 4056359d1c..97c1deb774 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -61,7 +61,7 @@ def SAMBA_PIDL(bld, pname, source,
cc = ""
if bld.CONFIG_SET("CPP"):
if isinstance(bld.CONFIG_GET("CPP"), list):
- cpp = 'CPP="%s"' % bld.CONFIG_GET("CPP")[0]
+ cpp = 'CPP="%s"' % " ".join(bld.CONFIG_GET("CPP"))
else:
cpp = 'CPP="%s"' % bld.CONFIG_GET("CPP")
@@ -71,7 +71,7 @@ def SAMBA_PIDL(bld, pname, source,
if bld.CONFIG_SET("CC"):
if isinstance(bld.CONFIG_GET("CC"), list):
- cc = 'CC="%s"' % bld.CONFIG_GET("CC")[0]
+ cc = 'CC="%s"' % " ".join(bld.CONFIG_GET("CC"))
else:
cc = 'CC="%s"' % bld.CONFIG_GET("CC")