===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** src/Makefile.cross	2015/06/01 17:36:17	1.77
--- src/Makefile.cross	2015/06/05 21:48:35	1.78
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.77 2015/06/01 17:36:17 miod Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.78 2015/06/05 21:48:35 tobiasu Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
***************
*** 289,296 ****
  # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
  cross-lib:	${CROSSGCC}
  	MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
! 	export MACHINE MACHINE_ARCH MACHINE_CPU; \
  	(cd ${.CURDIR}/lib; \
  	    for lib in csu libc; do \
  	    (cd $$lib; \
--- 289,297 ----
  # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
  cross-lib:	${CROSSGCC}
  	MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
! 	    BSDOBJDIR=${CROSSDIR}/usr/obj; \
! 	export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
  	(cd ${.CURDIR}/lib; \
  	    for lib in csu libc; do \
  	    (cd $$lib; \