From 4f73658544f988b1b495d1a84b7058fdace712ee Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 12 Apr 2010 10:16:54 +0200
Subject: wafsamba: don't add global dependencies to hostcc targets

metze
---
 buildtools/wafsamba/samba_deps.py | 3 ++-
 buildtools/wafsamba/wafsamba.py   | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'buildtools/wafsamba')

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 232ed34ae6..cca2febda9 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -323,7 +323,8 @@ def build_direct_deps(bld, tgt_list):
         t.direct_libs = set()
         t.direct_syslibs = set()
         deps = t.samba_deps_extended
-        deps.extend(global_deps)
+        if getattr(t, 'samba_use_global_deps', False):
+            deps.extend(global_deps)
         for d in deps:
             d = EXPAND_ALIAS(bld, d)
             if d == t.sname: continue
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 55ae36a247..386ed3c90f 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -198,6 +198,7 @@ def SAMBA_BINARY(bld, binname, source,
                  cflags='',
                  autoproto=None,
                  use_hostcc=False,
+                 use_global_deps=True,
                  compiler=None,
                  group='binaries',
                  manpages=None,
@@ -233,7 +234,8 @@ def SAMBA_BINARY(bld, binname, source,
                         subsystem_name = subsystem_name,
                         needs_python   = needs_python,
                         local_include  = local_include,
-                        use_hostcc     = use_hostcc)
+                        use_hostcc     = use_hostcc,
+                        use_global_deps= use_global_deps)
 
     bld.SET_BUILD_GROUP(group)
 
@@ -359,6 +361,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
                     subsystem_name=None,
                     enabled=True,
                     use_hostcc=False,
+                    use_global_deps=True,
                     vars=None,
                     needs_python=False):
     '''define a Samba subsystem'''
@@ -396,7 +399,8 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
         local_include  = local_include,
         local_include_first  = local_include_first,
         samba_subsystem= subsystem_name,
-        samba_use_hostcc = use_hostcc
+        samba_use_hostcc = use_hostcc,
+        samba_use_global_deps = use_global_deps
         )
 
     if cflags_end is not None:
-- 
cgit