diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-25 14:42:55 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-25 14:42:55 +0000 |
| commit | 39aae52e063ed023435320f21c58a1c16d866d1f (patch) | |
| tree | 0285cf003fd624dc16685552fba2f200571a98ff /lang/gcc44 | |
| parent | 113ff2274f575cf33db39900e0a169183f6f9c2d (diff) | |
| download | pkgsrc-39aae52e063ed023435320f21c58a1c16d866d1f.tar.gz | |
Use OPSYSVARS.
Diffstat (limited to 'lang/gcc44')
| -rw-r--r-- | lang/gcc44/Makefile | 7 | ||||
| -rw-r--r-- | lang/gcc44/options.mk | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 61c730396c9..821e9a0e0b9 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/01/24 16:14:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.46 2016/02/25 14:42:55 jperkin Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc44-${GCC_VERSION} @@ -69,13 +69,12 @@ CONFIGURE_ARGS+= --enable-long-long CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --disable-libssp CONFIGURE_ARGS+= --enable-threads=posix -.if ${OPSYS} == "Darwin" + # See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to # create a stub library, not just to remove symbols, so we must not # let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the # build fails for missing files. -CONFIGURE_ARGS+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip} -.endif +CONFIGURE_ARGS.Darwin+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} diff --git a/lang/gcc44/options.mk b/lang/gcc44/options.mk index 1d7cf02c370..7d8a642e79a 100644 --- a/lang/gcc44/options.mk +++ b/lang/gcc44/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.11 2012/04/13 11:01:32 hans Exp $ +# $NetBSD: options.mk,v 1.12 2016/02/25 14:42:55 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 PKG_SUPPORTED_OPTIONS= gcc-inplace-math nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-java gcc-objc -.if ${OPSYS} == "NetBSD" -PKG_SUGGESTED_OPTIONS+= nls -.elif ${OPSYS} == "SunOS" -PKG_SUGGESTED_OPTIONS+= gcc-inplace-math -.endif + +PKG_SUGGESTED_OPTIONS.NetBSD+= nls +PKG_SUGGESTED_OPTIONS.SunOS+= gcc-inplace-math PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++ PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran |