===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.95
retrieving revision 1.97
diff -u -r1.95 -r1.97
--- src/Makefile.cross	2017/06/08 18:33:08	1.95
+++ src/Makefile.cross	2017/09/12 08:16:13	1.97
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.95 2017/06/08 18:33:08 patrick Exp $
+# $OpenBSD: Makefile.cross,v 1.97 2017/09/12 08:16:13 mpi 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
@@ -83,10 +83,16 @@
 .if !empty(CLANG_ARCH:M${_arch})
 COMPILER_VERSION=clang
 BUILD_CLANG=yes
+CC=clang
+CXX=clang++
 .elif !empty(GCC3_ARCH:M${_arch})
 COMPILER_VERSION=gcc3
+CC=gcc
+CXX=g++
 .else
 COMPILER_VERSION=gcc4
+CC=gcc
+CXX=g++
 .endif
 
 .if !empty(PIE_ARCH:M${_arch})
@@ -190,6 +196,7 @@
 	    PATH=${CROSSPATH} \
 	    ${MAKE} -f Makefile.bsd-wrapper depend && \
 	    env CROSSDIR=${CROSSDIR} \
+	    CC=${CC} CXX=${CXX} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@@ -228,14 +235,9 @@
 	    MACHINE_ARCH=${TARGET_ARCH} \
 	    ${MAKE} obj)
 	(cd ${.CURDIR}/gnu/usr.bin/clang; \
-	    CC=clang CXX=clang++ \
+	    CC=${CC} CXX=${CXX} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    MACHINE_ARCH=${TARGET_ARCH} \
-	    ${MAKE} depend)
-	(cd ${.CURDIR}/gnu/usr.bin/clang; \
-	    CC=clang CXX=clang++ \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    MACHINE_ARCH=${TARGET_ARCH} \
 	    ${MAKE} all)
 	(cd ${.CURDIR}/gnu/usr.bin/clang; \
 	    DESTDIR=${CROSSDIR} \
@@ -263,6 +265,7 @@
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
+	    CC=${CC} CXX=${CXX} \
 	    ${MAKE} -f Makefile.bsd-wrapper all && \
 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
@@ -291,6 +294,8 @@
 	    PATH=${CROSSPATH} ${MAKE} depend  )
 	(cd ${.CURDIR}/gnu/usr.bin/cc; \
 	    env CROSSDIR=${CROSSDIR} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    CC=${CC} CXX=${CXX} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@@ -298,6 +303,7 @@
 	    ${MAKE} all )
 	(cd ${.CURDIR}/gnu/usr.bin/cc; \
 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@@ -393,8 +399,12 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
+		${MAKE} depend all); \
+	    (cd ${.CURDIR}/$$i; \
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		SKIPDIR=\"${NO_CROSS}\" \
 		DESTDIR=${CROSSDIR} \
-		${MAKE} depend all install); \
+		${MAKE} install); \
 	done
 
 cross-etc-root-var:	${CROSSOBJ}