From 378295c3fe813c70815a14c7de608e4a859bd6cc Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Fri, 10 Dec 2010 10:06:44 +0300 Subject: [PATCH] build: detect if conf.env['CPP'] is an array or not Autobuild-User: Matthieu Patou Autobuild-Date: Fri Dec 10 10:18:20 CET 2010 on sn-devel-104 --- buildtools/wafsamba/samba_pidl.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 6476211eea35..d0af9f27b4d6 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -61,12 +61,17 @@ def SAMBA_PIDL(bld, pname, source, cpp = "" cc = "" if bld.CONFIG_SET("CPP"): - cpp = "CPP=%s" % bld.CONFIG_GET("CPP") + if isinstance(bld.CONFIG_GET("CPP"), list): + cpp = "CPP=%s" % bld.CONFIG_GET("CPP")[0] + else: + cpp = "CPP=%s" % bld.CONFIG_GET("CPP") + if bld.CONFIG_SET("CC"): if isinstance(bld.CONFIG_GET("CC"), list): cc = "CC=%s" % bld.CONFIG_GET("CC")[0] else: cc = "CC=%s" % bld.CONFIG_GET("CC") + t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc), ext_out = '.c', before = 'cc', -- 2.34.1