diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc44/options.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lang/gcc44/options.mk b/lang/gcc44/options.mk index b64cc8e0fe2..9c8be9def68 100644 --- a/lang/gcc44/options.mk +++ b/lang/gcc44/options.mk @@ -1,16 +1,16 @@ -# $NetBSD: options.mk,v 1.4 2011/07/12 18:05:58 hans Exp $ +# $NetBSD: options.mk,v 1.5 2011/07/13 13:13:43 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 -PKG_SUPPORTED_OPTIONS= nls c++ fortran java objc #ada -PKG_SUGGESTED_OPTIONS= c++ fortran java objc +PKG_SUPPORTED_OPTIONS= 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 .endif -PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:c++ -PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:fortran -PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:java -PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:objc +PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++ +PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran +PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java +PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc .include "../../mk/bsd.options.mk" @@ -34,26 +34,26 @@ CONFIGURE_ARGS+= --disable-nls LANGS= c -.if !empty(PKG_OPTIONS:Mjava) -. if empty(PKG_OPTIONS:Mc++) -PKG_OPTIONS+= c++ +.if !empty(PKG_OPTIONS:Mgcc-java) +. if empty(PKG_OPTIONS:Mgcc-c++) +PKG_OPTIONS+= gcc-c++ . endif LANGS+= java REPLACE_PYTHON= libjava/contrib/aot-compile.in .endif -.if !empty(PKG_OPTIONS:Mc++) +.if !empty(PKG_OPTIONS:Mgcc-c++) LANGS+= c++ .endif -.if !empty(PKG_OPTIONS:Mfortran) +.if !empty(PKG_OPTIONS:Mgcc-fortran) LANGS+= fortran .endif -.if !empty(PKG_OPTIONS:Mobjc) +.if !empty(PKG_OPTIONS:Mgcc-objc) LANGS+= objc .endif -#.if !empty(PKG_OPTIONS:Mada) +#.if !empty(PKG_OPTIONS:Mgcc-ada) #LANGS+= ada #.endif |