diff options
| author | Matthieu Patou <mat@matws.net> | 2010-12-10 10:06:44 +0300 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2010-12-10 10:18:20 +0100 |
| commit | 378295c3fe813c70815a14c7de608e4a859bd6cc (patch) | |
| tree | 702a8c02bea0777d2d3f9a7ef62e647f1c02da06 | |
| parent | 1b63c78693ab5d244006769c1b41ff37d990d1b2 (diff) | |
| download | samba-378295c3fe813c70815a14c7de608e4a859bd6cc.tar.gz samba-378295c3fe813c70815a14c7de608e4a859bd6cc.tar.bz2 samba-378295c3fe813c70815a14c7de608e4a859bd6cc.zip | |
build: detect if conf.env['CPP'] is an array or not
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Fri Dec 10 10:18:20 CET 2010 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_pidl.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 6476211eea..d0af9f27b4 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', |