From 0545e04813819e0c266d629eb86b39cb0bb9c9b5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 22 Mar 2013 13:06:43 +1100 Subject: [PATCH 1/2] 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 (cherry picked from commit 7dc6dfd90c5182ed85042b22d4864d3e9b007531) --- buildtools/wafsamba/samba_pidl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 4056359..97c1deb 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") -- 1.7.11.7 From 1f1957eae03f6085c606214b4ea975c868a3e6fa Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 22 Mar 2013 13:47:46 +1100 Subject: [PATCH 2/2] build: Do not pass CPP="" to pidl, skip the env variable entirely This will cause pidl to use $CC -E instead. Andrew Bartlett Reviewed-by: Stefan Metzmacher (cherry picked from commit afe9343880ee27cf9fe937c6379c469435ef20d6) --- buildtools/wafsamba/samba_pidl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 97c1deb..2393c72 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -59,7 +59,7 @@ def SAMBA_PIDL(bld, pname, source, # the cd .. is needed because pidl currently is sensitive to the directory it is run in cpp = "" cc = "" - if bld.CONFIG_SET("CPP"): + if bld.CONFIG_SET("CPP") and bld.CONFIG_GET("CPP") != "": if isinstance(bld.CONFIG_GET("CPP"), list): cpp = 'CPP="%s"' % " ".join(bld.CONFIG_GET("CPP")) else: -- 1.7.11.7