diff options
| author |   drahn <drahn@openbsd.org> | 2017-08-11 19:36:37 +0000 |
|---|---|---|
| committer | drahn <drahn@openbsd.org> | 2017-08-11 19:36:37 +0000 |
| commit | 090d236b1890c89728bb6799be2b0e544d99e9ee (patch) | |
| tree | 1f4974b5959f9f5c9adabe3b8a1db4609153bfbe | |
| parent | make 'dump' mutually exclusive with writing out the data, to ease pleding (diff) | |
| download | wireguard-openbsd-090d236b1890c89728bb6799be2b0e544d99e9ee.tar.xz wireguard-openbsd-090d236b1890c89728bb6799be2b0e544d99e9ee.zip | |
Fix cross builds: no clang depend target, no DESTDIR on HOSTCC build
ok patrick@
| -rw-r--r-- | Makefile.cross | 13 |
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} |