diff options
| author | abs <abs@pkgsrc.org> | 2018-10-09 15:02:48 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2018-10-09 15:02:48 +0000 |
| commit | a3ee15ba6bc09f6474b8b32384f5b048d9108670 (patch) | |
| tree | 6464f7fdd342806bcea1099f8f68adf5d34520f0 /mk | |
| parent | 62d3573a836848cd325821bd541b319c0b8447e3 (diff) | |
| download | pkgsrc-a3ee15ba6bc09f6474b8b32384f5b048d9108670.tar.gz | |
Support single digit GCC_REQ values (5, 6 or 7)
Do not add 4 to avoid confusion between gcc44/48/49
Also switch USE_PKGSRC_GCC_RUNTIME checks to use _GCC_PKGBASE to match
against selected gcc
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/compiler/gcc.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index a4792d44a17..3c7d1348697 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.194 2018/10/08 20:02:17 rillig Exp $ +# $NetBSD: gcc.mk,v 1.195 2018/10/09 15:02:48 abs Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -134,13 +134,13 @@ _GCC48_PATTERNS= 4.[5-8] 4.[5-8].* _GCC49_PATTERNS= 4.9 4.9.* # _GCC5_PATTERNS matches N s.t. 5.0 <= N < 6. -_GCC5_PATTERNS= 5.* +_GCC5_PATTERNS= 5 5.* # _GCC6_PATTERNS matches N s.t. 6.0 <= N < 7. -_GCC6_PATTERNS= 6.* +_GCC6_PATTERNS= 6 6.* # _GCC7_PATTERNS matches N s.t. 7.0 <= N < 8. -_GCC7_PATTERNS= 7.* +_GCC7_PATTERNS= 7 7.* # _GCC_AUX_PATTERNS matches 8-digit date YYYYMMDD* _GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9][0-3][0-9]* @@ -907,15 +907,15 @@ PREPEND_PATH+= ${_GCC_DIR}/bin # Special case packages which are themselves a dependency of gcc runtime. . if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) && \ empty(PKGPATH:Mlang/gcc4?) && empty(PKGPATH:Mlang/gcc[5-9]) -. if !empty(CC_VERSION:Mgcc-4.8*) +. if !empty(_GCC_PKGBASE:Mgcc48) . include "../../lang/gcc48-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-4.9*) +. elif !empty(_GCC_PKGBASE:Mgcc49) . include "../../lang/gcc49-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-5.*) +. elif !empty(_GCC_PKGBASE:Mgcc5) . include "../../lang/gcc5-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-6.*) +. elif !empty(_GCC_PKGBASE:Mgcc6) . include "../../lang/gcc6-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-7.*) +. elif !empty(_GCC_PKGBASE:Mgcc7) . include "../../lang/gcc7-libs/buildlink3.mk" . else PKG_FAIL_REASON+= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}" |