build: Do not pass CPP="" to pidl, skip the env variable entirely
authorAndrew Bartlett <abartlet@samba.org>
Fri, 22 Mar 2013 02:47:46 +0000 (13:47 +1100)
committerKarolin Seeger <kseeger@samba.org>
Tue, 2 Apr 2013 19:15:44 +0000 (21:15 +0200)
This will cause pidl to use $CC -E instead.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit afe9343880ee27cf9fe937c6379c469435ef20d6)

The last 2 patches address bug #9739 - [PATCH] PIDL build fixes for hosts
without CPP (Solaris 11).

buildtools/wafsamba/samba_pidl.py

index 97c1deb77480e23021c4def88d179d1dc419797b..2393c72c6925a077f47ea2c363a0a767bc0637db 100644 (file)
@@ -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: