From da84242f5b91858b0df9ace9c565dd2a53d4998a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 19 Feb 2012 16:06:01 +0100 Subject: 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 Autobuild-Date: Sun Feb 19 17:43:06 CET 2012 on sn-devel-104 --- source4/heimdal_build/wscript_build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/heimdal_build') 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') -- cgit