pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk When using imake and buildlink together, assert our...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2acbdf2eede5
branches:  trunk
changeset: 471121:2acbdf2eede5
user:      danw <danw%pkgsrc.org@localhost>
date:      Fri Mar 19 00:03:55 2004 +0000

description:
When using imake and buildlink together, assert our definitions of
CC and CXX on the make command line, in case imake's definitions use
complete paths (which would get around the buildlink wrappers)

diffstat:

 mk/bsd.pkg.mk |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r e14e9f39ef8f -r 2acbdf2eede5 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Mar 18 23:29:36 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Mar 19 00:03:55 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1424 2004/03/17 16:36:28 danw Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1425 2004/03/19 00:03:55 danw Exp $
 #
 # This file is in the public domain.
 #
@@ -168,6 +168,9 @@
                        IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX}    \
                       IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX}    \
                        IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
+. if empty(USE_BUILDLINK2:M[nN][oO]) || empty(USE_BUILDLINK3:M[nN][oO])
+MAKE_FLAGS+=           CC="${CC}" CXX="${CXX}"
+. endif
 .endif
 .if defined(USE_X11BASE)
 USE_X11?=              implied



Home | Main Index | Thread Index | Old Index