From e631dd19cabee17463e08b470eae76a8cf63df05 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Thu, 25 Feb 2016 14:42:55 +0000
Subject: Use OPSYSVARS.

---
 lang/gcc5/Makefile   | 22 +++++++++-------------
 lang/gcc5/options.mk | 16 +++++-----------
 2 files changed, 14 insertions(+), 24 deletions(-)

(limited to 'lang/gcc5')

diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 17c3846addf..6bf09b57ad8 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/02/06 22:19:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/25 14:42:56 jperkin Exp $
 
 GCC_PKGNAME=		gcc5
 .include		"version.mk"
@@ -98,20 +98,16 @@ CONFIGURE_ARGS+=	--enable-libssp
 .endif
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-MAKE_ENV+=		ac_cv_func_gethostbyname_r=no
-MAKE_ENV+=		ac_cv_func_freelocale=no
-MAKE_ENV+=		ac_cv_func_newlocale=no
-MAKE_ENV+=		ac_cv_func_uselocale=no
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
 
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
+MAKE_ENV.NetBSD+=	ac_cv_func_freelocale=no
+MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
+MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
 
+CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
diff --git a/lang/gcc5/options.mk b/lang/gcc5/options.mk
index 6b221a96157..eaa1ae3fbca 100644
--- a/lang/gcc5/options.mk
+++ b/lang/gcc5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/07/16 12:03:36 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/25 14:42:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -6,16 +6,10 @@ PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
 			gcc-graphite gcc-inplace-math
 
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.else
-.endif
+PKG_SUGGESTED_OPTIONS.DragonFly+=	nls
+PKG_SUGGESTED_OPTIONS.Linux+=		nls
+PKG_SUGGESTED_OPTIONS.NetBSD+=		nls
+PKG_SUGGESTED_OPTIONS.SunOS+=		gcc-inplace-math
 
 ###
 ### Determine if multilib is avalible.
-- 
cgit v1.2.3