From 4aee2014bd80163cb466a42cfa2da84941f2690b Mon Sep 17 00:00:00 2001 From: mrg Date: Sat, 7 Dec 2019 07:18:52 +0000 Subject: [PATCH] apply GCC hack for arm64 to all GCC versions until further notice. fixes GCC-8 arm64 systems. --- lang/ruby24-base/hacks.mk | 4 ++-- lang/ruby25-base/hacks.mk | 4 ++-- lang/ruby26-base/hacks.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/ruby24-base/hacks.mk b/lang/ruby24-base/hacks.mk index fceda0e2a48b..7e60527c86fa 100644 --- a/lang/ruby24-base/hacks.mk +++ b/lang/ruby24-base/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.3 2019/02/07 10:07:21 mrg Exp $ +# $NetBSD: hacks.mk,v 1.4 2019/12/07 07:18:52 mrg Exp $ .if !defined(RUBY24_BASE_HACKS_MK) RUBY24_BASE_HACKS_MK= defined @@ -36,7 +36,7 @@ BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks # On NetBSD/aarch64, gcc optimisation produces segmentation faulting # miniruby binary. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-[67].*) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*) PKG_HACKS+= optimisation BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer .endif diff --git a/lang/ruby25-base/hacks.mk b/lang/ruby25-base/hacks.mk index fceda0e2a48b..7e60527c86fa 100644 --- a/lang/ruby25-base/hacks.mk +++ b/lang/ruby25-base/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.3 2019/02/07 10:07:21 mrg Exp $ +# $NetBSD: hacks.mk,v 1.4 2019/12/07 07:18:52 mrg Exp $ .if !defined(RUBY24_BASE_HACKS_MK) RUBY24_BASE_HACKS_MK= defined @@ -36,7 +36,7 @@ BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks # On NetBSD/aarch64, gcc optimisation produces segmentation faulting # miniruby binary. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-[67].*) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*) PKG_HACKS+= optimisation BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer .endif diff --git a/lang/ruby26-base/hacks.mk b/lang/ruby26-base/hacks.mk index 9bef9537ac90..86e0530b5b19 100644 --- a/lang/ruby26-base/hacks.mk +++ b/lang/ruby26-base/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2019/02/07 10:07:21 mrg Exp $ +# $NetBSD: hacks.mk,v 1.3 2019/12/07 07:18:52 mrg Exp $ .if !defined(RUBY24_BASE_HACKS_MK) RUBY24_BASE_HACKS_MK= defined @@ -36,7 +36,7 @@ BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks # On NetBSD/aarch64, gcc optimisation produces segmentation faulting # miniruby binary. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-[67].*) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*) PKG_HACKS+= optimisation BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer .endif