summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobiasu <tobiasu@openbsd.org>2015-06-05 21:48:35 +0000
committertobiasu <tobiasu@openbsd.org>2015-06-05 21:48:35 +0000
commit917534cf1d80263e03eaeb79e103daf58ee7f27a (patch)
treeeea7fbaf3208c91b28e7a18031444796d85011f3
parentFix library search path so we link against the freshly built libcrypto.so (diff)
downloadwireguard-openbsd-917534cf1d80263e03eaeb79e103daf58ee7f27a.tar.xz
wireguard-openbsd-917534cf1d80263e03eaeb79e103daf58ee7f27a.zip
Use target BSDOBJDIR when cross-compiling libraries
ok mpi@
-rw-r--r--Makefile.cross7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.cross b/Makefile.cross
index ec677bc105f..fd2c2388728 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.77 2015/06/01 17:36:17 miod Exp $
+# $OpenBSD: Makefile.cross,v 1.78 2015/06/05 21:48:35 tobiasu 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
@@ -289,8 +289,9 @@ ${CROSSGCC}: ${CROSSBINUTILS}
# XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
cross-lib: ${CROSSGCC}
MACHINE=${TARGET} \
- MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
- export MACHINE MACHINE_ARCH MACHINE_CPU; \
+ MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
+ BSDOBJDIR=${CROSSDIR}/usr/obj; \
+ export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
(cd ${.CURDIR}/lib; \
for lib in csu libc; do \
(cd $$lib; \