From 9b78a729bae8f2a5d171c6120bf393de545ee716 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Thu, 25 Feb 2016 11:32:19 +0000
Subject: Use OPSYSVARS.

---
 cross/gcc-mips-current/Makefile | 10 +++-------
 cross/libtool-base/Makefile     | 18 ++++++------------
 2 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'cross')

diff --git a/cross/gcc-mips-current/Makefile b/cross/gcc-mips-current/Makefile
index fd25f5d842d..89e354f1ee4 100644
--- a/cross/gcc-mips-current/Makefile
+++ b/cross/gcc-mips-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/12 10:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/25 11:35:33 jperkin Exp $
 
 GCC_DIST_VERSION=4.9.2
 GCC_PKGNAME=	gcc-mips-${GCC_DIST_VERSION}
@@ -77,12 +77,8 @@ CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
 
 TARGET=			mipsel--netbsd
 CONFIGURE_ARGS+=	--target=${TARGET}
diff --git a/cross/libtool-base/Makefile b/cross/libtool-base/Makefile
index 04edbbc5e52..1221b7c20b8 100644
--- a/cross/libtool-base/Makefile
+++ b/cross/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/10/09 13:44:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/25 11:35:33 jperkin Exp $
 
 # XXX This is kludgerific copypasta of devel/libtool-base/Makefile for
 # cross-compilation.  Please make it go away!
@@ -44,23 +44,17 @@ TEST_TARGET=	check
 
 OVERRIDE_DIRDEPTH.install-sh=	1
 
-.if ${OPSYS} == "AIX"
-
-# always build libraries and executables that use the runtime linker.
+# Always build libraries and executables that use the runtime linker.
 # in addition, disable libtool locking, as the test is broken on AIX,
 # and results in files being locked indefinitely.
-LDFLAGS+=		-Wl,-brtl
-CONFIGURE_ARGS+=	--disable-libtool-lock
-
-.elif ${OPSYS} == "IRIX"
+LDFLAGS.AIX+=		-Wl,-brtl
+CONFIGURE_ARGS.AIX+=	--disable-libtool-lock
 
 # The MIPSpro compiler doesn't support -c with -o, but the locking
 # workaround is itself broken.  Disable it unconditionally.
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.IRIX+=	--disable-libtool-lock
 
-.elif ${OPSYS} == "SunOS"
-CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
-.endif
+CFLAGS.SunOS+=	${_COMPILER_ABI_FLAG.${ABI}}
 
 # We are going to want libtool to find the same versions of the C, C++,
 # and Fortran compilers.
-- 
cgit v1.2.3