Fix cross builds: no clang depend target, no DESTDIR on HOSTCC build

ok patrick@

1 files changed, 6 insertions, 7 deletions

diff --git a/Makefile.cross b/Makefile.cross
index 574abcbd9ae..7d68bd16c0c 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.95 2017/06/08 18:33:08 patrick Exp $
+# $OpenBSD: Makefile.cross,v 1.96 2017/08/11 19:36:37 drahn 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
@@ -231,11 +231,6 @@ ${CROSSGCC}:		${CROSSBINUTILS}
 	    CC=clang CXX=clang++ \
 	    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} \
@@ -393,8 +388,12 @@ cross-sys:   ${CROSSOBJ}
 	    (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}