svn commit: r217213 - head/lib/bind

[John Baldwin]

On Sunday, January 09, 2011 6:47:11 pm Doug Barton wrote:
> Author: dougb
> Date: Sun Jan  9 23:47:11 2011
> New Revision: 217213
> URL: http://svn.freebsd.org/changeset/base/217213
> 
> Log:
>   Revert part of r217071 so that us mere mortals can clearly see
>   what this bit of code is intended to do. :)
>   
>   Approved by:	imp
> 
> Modified:
>   head/lib/bind/config.mk
> 
> Modified: head/lib/bind/config.mk
> 
==============================================================================
> --- head/lib/bind/config.mk	Sun Jan  9 23:46:24 2011	(r217212)
> +++ head/lib/bind/config.mk	Sun Jan  9 23:47:11 2011	(r217213)
> @@ -65,7 +65,11 @@ CFLAGS+=	-I${LIB_BIND_DIR}
>  .endif
>  
>  # Use the right version of the atomic.h file from lib/isc
> -ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/}
> +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"

This should use MACHINE_CPUARCH instead of MACHINE_ARCH?

> +ISC_ATOMIC_ARCH=	x86_32
> +.else
> +ISC_ATOMIC_ARCH=	${MACHINE_CPUARCH}
> +.endif
>  
>  # Optional features
>  .if ${MK_BIND_LARGE_FILE} == "yes"
> 

-- 
John Baldwin