From 7e75c9318ab702378acca04c265aae8710b6cbdd Mon Sep 17 00:00:00 2001 From: jschauma Date: Thu, 12 Jun 2003 15:27:08 +0000 Subject: Initiate support for X11 apps under IRIX. We introduce two new variables: ABI and IMAKEOPTS ABI determines the correct ABI to use and is set during bootstrapping from /etc/compiler.defaults. IMAKEOPTS are the options passed to imake to allow it to set the right definitions and find the right paths etc. Use IMAKEOPTS with SunOS, too. IRIX will always require xpkgwedge, since it's got a bogus X11BASE. When linking against libXaw, make sure we get the right ABI. --- mk/xaw.buildlink2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk/xaw.buildlink2.mk') diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk index bbd5ee946fc..b0a9044f6f0 100644 --- a/mk/xaw.buildlink2.mk +++ b/mk/xaw.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink2.mk,v 1.9 2003/06/08 22:47:28 jschauma Exp $ +# $NetBSD: xaw.buildlink2.mk,v 1.10 2003/06/12 15:27:09 jschauma Exp $ .if !defined(XAW_BUILDLINK2_MK) XAW_BUILDLINK2_MK= # defined @@ -19,7 +19,7 @@ BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d} BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw} .else BUILDLINK_PREFIX.Xaw?= ${X11BASE} -LIBXAW?= -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -lXaw +LIBXAW?= -L${X11BASE}/lib${ABI} -Wl,${RPATH_FLAG}${X11BASE}/lib${ABI} -lXaw .endif MAKE_ENV+= LIBXAW="${LIBXAW}" -- cgit v1.2.3