diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-10-27 10:31:05 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-10-27 10:31:05 +0000 |
| commit | b0a6ec0b90687a42a03f796596ef58b6e0b1a84d (patch) | |
| tree | 1b53197d23a75acfa40b64749be8e9cff790c16c /mk/bsd.prefs.mk | |
| parent | e6d1c9d7980f3f89c85fb57707b79a306a28651d (diff) | |
| download | pkgsrc-b0a6ec0b90687a42a03f796596ef58b6e0b1a84d.tar.gz | |
Add support for enabling cwrappers automatically. USE_CWRAPPERS now defaults
to "auto", which will enable cwrappers if the _OPSYS_SUPPORTS_CWRAPPERS
platform variable is set to "yes".
Switch over to cwrappers by default for Darwin, Linux, and SunOS (except when
using the sunpro compiler).
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 55516d1b4db..673b48f4062 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.387 2016/06/13 13:26:42 jperkin Exp $ +# $NetBSD: bsd.prefs.mk,v 1.388 2016/10/27 10:31:05 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -712,8 +712,13 @@ _PKGSRC_USE_SSP= no _PKGSRC_USE_SSP= yes .endif -# Enable cwrappers if requested unless we're building the wrappers themselves. -.if ${USE_CWRAPPERS:tl} != "no" && empty(PKGPATH:Mpkgtools/cwrappers) +# Enable cwrappers if not building the wrappers themselves, and if the user has +# explicitly requested them, or if they haven't but the compiler/platform is +# known to support them. +.if empty(PKGPATH:Mpkgtools/cwrappers) && \ + (${USE_CWRAPPERS:tl} == "yes" || \ + (${USE_CWRAPPERS:tl} == "auto" && \ + ${_OPSYS_SUPPORTS_CWRAPPERS:Uno} == "yes")) _USE_CWRAPPERS= yes .else _USE_CWRAPPERS= no |