===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- src/Makefile.cross	2019/10/18 02:57:25	1.106
+++ src/Makefile.cross	2019/11/07 11:32:23	1.107
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.106 2019/10/18 02:57:25 visa Exp $
+# $OpenBSD: Makefile.cross,v 1.107 2019/11/07 11:32:23 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
@@ -200,12 +200,6 @@
 ${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} \
 	    CC=${CC} CXX=${CXX} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
@@ -279,10 +273,6 @@
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
-	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper depend && \
-	    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} \
@@ -305,13 +295,6 @@
 .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} \
 	    COMPILER_VERSION=${COMPILER_VERSION} \
 	    CC=${CC} CXX=${CXX} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
@@ -359,13 +342,13 @@
 	    for lib in csu libcompiler_rt libc; do \
 	    (cd $$lib; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-		    ${MAKE} depend all ;\
+		    ${MAKE} all ;\
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
 		    ${MAKE} install); \
 	    done; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	        SKIPDIR=\"${NO_CROSS}\" \
-	        ${MAKE} depend all ; \
+	        ${MAKE} all ; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
 	        SKIPDIR=\"${NO_CROSS}\" \
 	        ${MAKE} install)
@@ -378,7 +361,7 @@
 	(cd ${.CURDIR}/$$i; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	        SKIPDIR=\"${BINUTILS} ${NO_CROSS}\" \
-	        ${MAKE} depend all ; \
+	        ${MAKE} all ; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
 	        SKIPDIR=\"${BINUTILS} ${NO_CROSS}\" \
 	        ${MAKE} install); \
@@ -392,7 +375,7 @@
 	(cd ${.CURDIR}/$$i; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	        SKIPDIR=\"${NO_CROSS}\" \
-	        ${MAKE} depend all ; \
+	        ${MAKE} all ; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
 	        SKIPDIR=\"${NO_CROSS}\" \
 	        ${MAKE} install); \
@@ -407,7 +390,7 @@
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
 		DESTDIR=${CROSSDIR} \
-		${MAKE} depend all install); \
+		${MAKE} all install); \
 	done
 
 cross-sys:   ${CROSSOBJ}
@@ -418,7 +401,7 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
-		${MAKE} depend all); \
+		${MAKE} all); \
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
@@ -432,13 +415,6 @@
 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
 	    DESTDIR=${CROSSDIR} \
 	    ${MAKE} distribution-etc-root-var)
-
-cross-depend:
-	@(cd ${.CURDIR} && \
-	    BSDOBJDIR=${CROSSDIR}/usr/obj \
-	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    SKIPDIR="${NO_CROSS}" \
-	    ${MAKE} depend)
 
 cross-clean:
 	@(cd ${.CURDIR} && \