Revert 42d4152ed4255f22ff0718d450f181468d7fb827.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Feb 2012 15:06:01 +0000 (16:06 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Feb 2012 16:43:06 +0000 (17:43 +0100)
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

source4/heimdal_build/wscript_build

index 8d62f215938ea6bc512633a07541cbad50e6750f..948191fbf05d76920557bda1cbdf22086592c786 100644 (file)
@@ -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')