strip -fno-gnu-keywords argument to SunPro, and munge -pthread into

-lpthread. ok'd by jlam.

addresses PR pkg/24966 from Charlie Allom.

2 files changed, 13 insertions, 3 deletions

diff --git a/mk/buildlink3/sunpro-cc-post-cache b/mk/buildlink3/sunpro-cc-post-cache
index be44e0b3e2f..9d3af365c63 100644
--- a/mk/buildlink3/sunpro-cc-post-cache
+++ b/mk/buildlink3/sunpro-cc-post-cache
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro-cc-post-cache,v 1.6 2004/02/16 22:22:38 grant Exp $
+# $NetBSD: sunpro-cc-post-cache,v 1.7 2004/06/13 08:50:15 grant Exp $
 #
 # This file implements the default action of the "cc" private cache
 # for the SunPro suite of compilers, and tells the wrapper to skip the
@@ -6,7 +6,7 @@
 # can't handle; they will instead by handled directly by
 # sunpro-cc-post-logic.
 
--[OW]*|-ansi|-f[pP][iI][cC]|-pedantic|-shared)
+-[OW]*|-ansi|-f[pP][iI][cC]|-fno-gnu-keywords|-pedantic|-pthread|-shared)
 	skipcache=yes
 	;;
 esac
diff --git a/mk/buildlink3/sunpro-cc-post-logic b/mk/buildlink3/sunpro-cc-post-logic
index 4bafa318cb3..771f201359d 100644
--- a/mk/buildlink3/sunpro-cc-post-logic
+++ b/mk/buildlink3/sunpro-cc-post-logic
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro-cc-post-logic,v 1.7 2004/02/18 11:10:35 jlam Exp $
+# $NetBSD: sunpro-cc-post-logic,v 1.8 2004/06/13 08:50:15 grant Exp $
 #
 # Silently accept some GCC compiler arguments by silently converting
 # them to the SunPro compiler equivalents.  This makes the SunPro
@@ -46,11 +46,21 @@ case $arg in
 	arg=-Kpic
 	addtoprivatecache=yes
 	;;
+-fno-gnu-keywords)
+	arg=
+	addtoprivatecache=yes
+	;;
 -pedantic)
 	# No flag is required for SunPro to be pedantic.
 	arg=
 	addtoprivatecache=yes
 	;;
+-pthread)
+	# SunPro doesn't understand -pthread, and only -lpthread is
+	# needed on Solaris.
+	arg=-lpthread
+	addtoprivatecache=yes
+	;;
 -shared)
 	# Solaris' linker uses -G to create shared objects.
 	#