From 0c0736330e5000251d23e6777a59190f1fef0058 Mon Sep 17 00:00:00 2001 From: agc Date: Fri, 30 Jul 2004 16:06:57 +0000 Subject: Pullup ticket 87 to the pkgsrc-2004Q2 branch, requested by Grant Beattie Solaris fix for buildlink3 Module Name: pkgsrc Committed By: grant Date: Sat Jul 10 12:55:08 UTC 2004 Modified Files: pkgsrc/mk/buildlink3: sunpro-cc-post-logic Log Message: explicitly don't transform "-Wl,*", fixing a bug that meant we were throwing away all -W arguments that weren't -Wl,-R. fixes building of a number of packages on Solaris. --- doc/CHANGES-pkgsrc-2004Q2 | 4 +++- mk/buildlink3/sunpro-cc-post-logic | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index 99730de2b18..998577a3a75 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.50 2004/07/30 16:03:44 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.51 2004/07/30 16:06:57 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -96,4 +96,6 @@ Pullup ticket 85, requested by Grant Beattie [agc 2004-07-30] Solaris fix for gtkmagnetic Pullup ticket 86, requested by Grant Beattie [agc 2004-07-30] Build fix for gopher +Pullup ticket 87, requested by Grant Beattie [agc 2004-07-30] + Solaris fix for buildlink3 diff --git a/mk/buildlink3/sunpro-cc-post-logic b/mk/buildlink3/sunpro-cc-post-logic index cf7541a8558..64907d909f9 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.8.2.1 2004/07/13 14:00:16 agc Exp $ +# $NetBSD: sunpro-cc-post-logic,v 1.8.2.2 2004/07/30 16:06:57 agc Exp $ # # Silently accept some GCC compiler arguments by silently converting # them to the SunPro compiler equivalents. This makes the SunPro @@ -28,6 +28,10 @@ case $arg in arg=`$echo "X$arg" | $Xsed -e "s|^-Wl,||g" -e "s|,| |g"` addtoprivatecache=yes ;; +-Wl,*) + # Explicitly do nothing to preserve arguments to be passed to + # the linker. + ;; -W*) # In fact, SunPro compilers don't even understand any -W* # arguments, so just silently ignore them all. -- cgit v1.2.3