summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-21 13:50:43 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:59 +1000
commita538ed1c826b67dafc1e8f1492180f9a17e843dc (patch)
treeb3569d5cb2f814a25db3c32b3497788b8c74de55
parent9e0d0fa25066f658b7ca49e324919738c695917e (diff)
downloadsamba-a538ed1c826b67dafc1e8f1492180f9a17e843dc.tar.gz
samba-a538ed1c826b67dafc1e8f1492180f9a17e843dc.tar.bz2
samba-a538ed1c826b67dafc1e8f1492180f9a17e843dc.zip
build: fixed build of heimdal/lib/roken/err.h
-rw-r--r--buildtools/wafsamba/wafsamba.py3
-rw-r--r--source4/heimdal_build/wscript_build9
2 files changed, 11 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index bfe20ce5eb..52460ff23a 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -411,7 +411,7 @@ def SAMBA_GENERATOR(bld, name, rule, source, target,
return
if not enabled:
- return False
+ return
bld.SET_BUILD_GROUP(group)
bld(
@@ -455,6 +455,7 @@ def SETUP_BUILD_GROUPS(bld):
bld.p_ln = bld.srcnode # we do want to see all targets!
bld.env['USING_BUILD_GROUPS'] = True
bld.add_group('setup')
+ bld.add_group('build_compiler_source')
bld.add_group('base_libraries')
bld.add_group('build_compilers')
bld.add_group('build_source')
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 895695f484..46b2c35dea 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -259,6 +259,15 @@ bld.SAMBA_GENERATOR(
enabled = not bld.CONFIG_SET('HAVE_IFADDRS_H')
)
+bld.SAMBA_GENERATOR(
+ group='build_compiler_source',
+ name="HEIMDAL_ERR_H",
+ rule="ln -f ${SRC} ${TGT}",
+ source = '../heimdal/lib/roken/err.hin',
+ target = '../heimdal/lib/roken/err.h',
+ enabled = not bld.CONFIG_SET('HAVE_ERR_H')
+ )
+
bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5',
bld.SUBDIR('../heimdal/lib/krb5/',
'''acache.c add_et_list.c