diff options
| author | cube <cube@pkgsrc.org> | 2003-10-24 12:07:14 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2003-10-24 12:07:14 +0000 |
| commit | c803330a122acd9767658bafd3ee840265c4c892 (patch) | |
| tree | 01c1a5903db2bb43996eb573b342794e9a409aaa /mk | |
| parent | 875b11a2a74d1656b1b4beadff0df09c0681e160 (diff) | |
| download | pkgsrc-c803330a122acd9767658bafd3ee840265c4c892.tar.gz | |
Remove '-' from the version part of _GCC_IN_USE so that pkg_admin can deal
with the installed gcc when it has a localized version (such as our
gcc-3.3.2-nb1).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/compiler.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/compiler.mk b/mk/compiler.mk index 5a315162133..c0e900f8025 100644 --- a/mk/compiler.mk +++ b/mk/compiler.mk @@ -1,4 +1,4 @@ -# $NetBSD: compiler.mk,v 1.21 2003/10/18 09:14:47 grant Exp $ +# $NetBSD: compiler.mk,v 1.22 2003/10/24 12:07:14 cube Exp $ # This Makefile fragment implements handling for supported # C/C++/fortran compilers. @@ -102,7 +102,7 @@ _GCC_VERSION_REQD= gcc>=${GCC_REQD} GCC_REQD= 2.95.3 _NEED_PKGSRC_GCC= YES . else -_GCC_IN_USE= gcc-${_CC_VERSION} +_GCC_IN_USE= gcc-${_CC_VERSION:S/-//g} _NEED_PKGSRC_GCC!= \ if ${PKG_ADMIN} pmatch '${_GCC_VERSION_REQD}' ${_GCC_IN_USE}; then \ ${ECHO} "NO"; \ |