diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2005-01-09 22:27:08 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2005-01-09 22:27:08 +0000 |
| commit | e4a349ba16ee91528e81919960e13404a419b3ad (patch) | |
| tree | e9fe2708cd75fc121b7d92351ba86c9df7911433 /gnu | |
| parent | b68d02319600b0d7f939f082206c1cb8a035b4c8 (diff) | |
go look in MAKEOBJDIR if defined, ensuring cross-pieces have a chance
to find each other.
okay niklas@ (`deja-vu')
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/egcs/libf2c/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | gnu/egcs/libobjc/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | gnu/egcs/libstdc++/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | gnu/lib/libobjc/Makefile.bsd-wrapper | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/gnu/egcs/libf2c/Makefile.bsd-wrapper b/gnu/egcs/libf2c/Makefile.bsd-wrapper index 75da467b2f1..f0ab150a735 100644 --- a/gnu/egcs/libf2c/Makefile.bsd-wrapper +++ b/gnu/egcs/libf2c/Makefile.bsd-wrapper @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2004/09/18 20:54:45 deraadt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2005/01/09 22:27:07 espie Exp $ NOLINT= LIBIBERTY_INCLUDES=$(.CURDIR)/../../lib/libiberty/include EGCS_DIR= $(.CURDIR)/.. -.if defined(OBJMACHINE) +.if defined(MAKEOBJDIR) +OBJDIR=${MAKEOBJDIR} +.elif defined(OBJMACHINE) OBJDIR= obj.${MACHINE} .else OBJDIR= obj diff --git a/gnu/egcs/libobjc/Makefile.bsd-wrapper b/gnu/egcs/libobjc/Makefile.bsd-wrapper index fbc1f1fe38d..41a6c4d2e33 100644 --- a/gnu/egcs/libobjc/Makefile.bsd-wrapper +++ b/gnu/egcs/libobjc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2004/09/18 20:54:45 deraadt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2005/01/09 22:27:07 espie Exp $ NOLINT= @@ -8,7 +8,9 @@ LIBIBERTY_INCLUDES=${.CURDIR}/../../lib/libiberty/include #LDADD+= -lm EGCS_DIR= $(.CURDIR)/.. -.if defined(OBJMACHINE) +.if defined(MAKEOBJDIR) +OBJDIR=${MAKEOBJDIR} +.elif defined(OBJMACHINE) OBJDIR= obj.${MACHINE} .else OBJDIR= obj diff --git a/gnu/egcs/libstdc++/Makefile.bsd-wrapper b/gnu/egcs/libstdc++/Makefile.bsd-wrapper index 4ad9cb4537d..1e88a1f2ffd 100644 --- a/gnu/egcs/libstdc++/Makefile.bsd-wrapper +++ b/gnu/egcs/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2004/09/18 20:54:45 deraadt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2005/01/09 22:27:07 espie Exp $ .if (${MACHINE_ARCH} == "mips") NOPIC= @@ -10,7 +10,9 @@ IO_DIR= $(.CURDIR)/../libio LIBIBERTY_DIR= $(.CURDIR)/../../lib/libiberty STD_DIR= $(.CURDIR)/std -.if defined(OBJMACHINE) +.if defined(MAKEOBJDIR) +OBJDIR=${MAKEOBJDIR} +.elif defined(OBJMACHINE) OBJDIR= obj.${MACHINE} .else OBJDIR= obj diff --git a/gnu/lib/libobjc/Makefile.bsd-wrapper b/gnu/lib/libobjc/Makefile.bsd-wrapper index d4f65217804..313c403b4d4 100644 --- a/gnu/lib/libobjc/Makefile.bsd-wrapper +++ b/gnu/lib/libobjc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2004/01/15 23:45:37 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2005/01/09 22:27:07 espie Exp $ LIB= objc @@ -13,7 +13,9 @@ GCCDIR= $(.CURDIR)/../../egcs/gcc GCCSRCDIR=${GCCDIR} .endif -.if defined(OBJMACHINE) +.if defined(MAKEOBJDIR) +OBJDIR= ${MAKEOBJDIR} +.elif defined(OBJMACHINE) OBJDIR= obj.${MACHINE} .else OBJDIR= obj |