diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-30 11:21:35 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:49:00 +1100 |
| commit | 78d732cc4002f92fa7741e848a8c922e60989a56 (patch) | |
| tree | 429673e4088b67c55f2b64d2a64ab3961adceddd | |
| parent | ae0f420dd989b165876b4b07754043a01604583e (diff) | |
| download | samba-78d732cc4002f92fa7741e848a8c922e60989a56.tar.gz samba-78d732cc4002f92fa7741e848a8c922e60989a56.tar.bz2 samba-78d732cc4002f92fa7741e848a8c922e60989a56.zip | |
waf: cope with subsystems with no static modules
we still need the STATIC_xx_MODULES define when there are no static
modules. It contains just the sentinal.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 56af446df3..8dc1350c73 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -225,14 +225,16 @@ def add_init_functions(self): if m is not None: modules.append(m) - if modules == []: - return - sentinal = getattr(self, 'init_function_sentinal', 'NULL') targets = LOCAL_CACHE(bld, 'TARGET_TYPE') - cflags = getattr(self, 'samba_cflags', [])[:] + + if modules == []: + cflags.append('-DSTATIC_%s_MODULES=%s' % (sname.replace('-','_'), sentinal)) + self.ccflags = cflags + return + for m in modules: bld.ASSERT(m in subsystems, "No init_function defined for module '%s' in target '%s'" % (m, self.sname)) |