pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk move a SunPro tweak to compiler.mk.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccdd2e5e4dc7
branches:  trunk
changeset: 461202:ccdd2e5e4dc7
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Sep 12 16:07:09 2003 +0000

description:
move a SunPro tweak to compiler.mk.

diffstat:

 mk/bsd.prefs.mk |  10 +---------
 mk/compiler.mk  |  11 ++++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (45 lines):

diff -r c518bc0a02f3 -r ccdd2e5e4dc7 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Fri Sep 12 15:54:40 2003 +0000
+++ b/mk/bsd.prefs.mk   Fri Sep 12 16:07:09 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.123 2003/09/12 10:49:31 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.124 2003/09/12 16:07:09 grant Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -394,12 +394,4 @@
 #
 WRKLOG?=               ${WRKDIR}/.work.log
 
-# Sun C++ compilers don't support passing ld flags with -Wl to CC.
-#
-.if defined(USE_SUNPRO)
-_COMPILER_LD_FLAG=             # pattern for Sun compilers
-.else
-_COMPILER_LD_FLAG=     -Wl,    # pattern for GCC and others
-.endif
-
 .endif # BSD_PKG_MK
diff -r c518bc0a02f3 -r ccdd2e5e4dc7 mk/compiler.mk
--- a/mk/compiler.mk    Fri Sep 12 15:54:40 2003 +0000
+++ b/mk/compiler.mk    Fri Sep 12 16:07:09 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.3 2003/09/12 15:54:40 grant Exp $
+# $NetBSD: compiler.mk,v 1.4 2003/09/12 16:07:09 grant Exp $
 
 # This Makefile fragment implements handling for supported
 # C/C++/fortran compilers.
@@ -101,4 +101,13 @@
 LDFLAGS+=              ${_GCC_LDFLAGS}
 .endif
 
+# The SunPro C++ compiler doesn't support passing linker flags with
+# -Wl to CC, so we make buildlink2 perform the required magic.
+#
+.if defined(USE_SUNPRO)
+_COMPILER_LD_FLAG=             # SunPro compiler
+.else
+_COMPILER_LD_FLAG=     -Wl,    # GCC and others
+.endif
+
 .endif # COMPILER_MK



Home | Main Index | Thread Index | Old Index