===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** src/Makefile.cross	2017/01/27 13:38:40	1.92
--- src/Makefile.cross	2017/03/21 10:41:33	1.93
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.92 2017/01/27 13:38:40 jsg 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.93 2017/03/21 10:41:33 patrick 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
***************
*** 62,68 ****
  		HOSTLDFLAGS=\"${LDFLAGS}\" \
  		CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
  		CXXFLAGS=\"${CROSSCXXFLAGS}\" \
! 		LDFLAGS=\"${CROSSLDFLAGS}\"
  CROSSADDPATH=:${CROSSDIR}/usr/${TARGET_CANON}/bin
  CROSSPATH=	/usr/bin:/bin:/usr/sbin:/sbin${CROSSADDPATH}
  CROSSLANGS?=	c c++
--- 62,69 ----
  		HOSTLDFLAGS=\"${LDFLAGS}\" \
  		CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
  		CXXFLAGS=\"${CROSSCXXFLAGS}\" \
! 		LDFLAGS=\"${CROSSLDFLAGS}\" \
! 		CROSSDIR=\"${CROSSDIR}\"
  CROSSADDPATH=:${CROSSDIR}/usr/${TARGET_CANON}/bin
  CROSSPATH=	/usr/bin:/bin:/usr/sbin:/sbin${CROSSADDPATH}
  CROSSLANGS?=	c c++
***************
*** 181,199 ****
  
  ${CROSSBINUTILS}:	${CROSSINCLUDES}
  	(cd ${.CURDIR}/${BINUTILS_DIR}; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
! 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    COMPILER_VERSION=${COMPILER_VERSION} \
- 	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper install)
  	@for cmd in ${BINUTILS}; do \
--- 182,202 ----
  
  ${CROSSBINUTILS}:	${CROSSINCLUDES}
  	(cd ${.CURDIR}/${BINUTILS_DIR}; \
+ 	    env CROSSDIR=${CROSSDIR} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
+ 	    env CROSSDIR=${CROSSDIR} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
! 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
  	    COMPILER_VERSION=${COMPILER_VERSION} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+ 	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper install)
  	@for cmd in ${BINUTILS}; do \
***************
*** 274,290 ****
  	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
  .else
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
- 	    CROSSDIR=${CROSSDIR} \
  	    MACHINE=${TARGET} \
  	    PATH=${CROSSPATH} ${MAKE} depend  )
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
- 	    CROSSDIR=${CROSSDIR} \
  	    MACHINE=${TARGET} \
  	    ${MAKE} all )
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
--- 277,293 ----
  	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
  .else
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+ 	    env CROSSDIR=${CROSSDIR} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    MACHINE=${TARGET} \
  	    PATH=${CROSSPATH} ${MAKE} depend  )
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+ 	    env CROSSDIR=${CROSSDIR} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    MACHINE=${TARGET} \
  	    ${MAKE} all )
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \