summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-02-19 16:06:01 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-02-19 17:43:06 +0100
commitda84242f5b91858b0df9ace9c565dd2a53d4998a (patch)
tree32520c649004d29c49d79599d836088526bdf5de /source4
parent5de8beca1815ae15eaf44c30185228f1fa5c6d51 (diff)
downloadsamba-da84242f5b91858b0df9ace9c565dd2a53d4998a.tar.gz
samba-da84242f5b91858b0df9ace9c565dd2a53d4998a.tar.bz2
samba-da84242f5b91858b0df9ace9c565dd2a53d4998a.zip
Revert 42d4152ed4255f22ff0718d450f181468d7fb827.
asn1_compile and com_err already depended on LIBREPLACE_HOSTCC; depending on replace too causes waf to break (source lib/replace/replace.c is in more than one subsystem of target 'asn1_compile': ['LIBREPLACE_HOSTCC', 'replace']) Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sun Feb 19 17:43:06 CET 2012 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_build4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 8d62f21593..948191fbf0 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -921,7 +921,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ASN1_COMPILE'):
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
includes='../heimdal/lib/asn1',
group='build_compilers',
- deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC replace',
+ deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
install=False
)
bld.env['ASN1_COMPILE'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'asn1_compile')
@@ -935,7 +935,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
includes='../heimdal/lib/com_err',
group='build_compilers',
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
- deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC replace',
+ deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
install=False
)
bld.env['COMPILE_ET'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'compile_et')