summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-09-12 16:07:09 +0000
committergrant <grant@pkgsrc.org>2003-09-12 16:07:09 +0000
commitb04786501a307caf5263c5e6f3e3badf25e14cd0 (patch)
treecd5be2467dadec41ea727a58b0d266282f60031d /mk
parentada56b5a0bd658f22d44082b7161f523a0c6d4d3 (diff)
downloadpkgsrc-b04786501a307caf5263c5e6f3e3badf25e14cd0.tar.gz
move a SunPro tweak to compiler.mk.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk10
-rw-r--r--mk/compiler.mk11
2 files changed, 11 insertions, 10 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 77bb7b35c37..4278969cf0c 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -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 @@ WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME}
#
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 --git a/mk/compiler.mk b/mk/compiler.mk
index d446344fc16..816e7613ca4 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -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 @@ _GCC_LDFLAGS= -L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFI
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