[src/trunk]: src/share/mk Change defined(CXX_SUPCXX) to MKCXXSUPCXX != "no".

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bb0694e195f4
branches:  trunk
changeset: 550024:bb0694e195f4
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jul 28 07:03:43 2003 +0000

description:
Change  defined(CXX_SUPCXX)  to  MKCXXSUPCXX != "no".

Clarify that command-line overrides of the MKxxx variables should be
done via the environment rather than make(1) command-line variable
assignment, since the latter doesn't actually work as intended.

diffstat:

 share/mk/bsd.README  |  46 ++++++++++++++++++++++++++++------------------
 share/mk/bsd.own.mk  |   8 ++++----
 share/mk/bsd.prog.mk |   4 ++--
 3 files changed, 34 insertions(+), 24 deletions(-)

diffs (147 lines):

diff -r afc60e8e086f -r bb0694e195f4 share/mk/bsd.README
--- a/share/mk/bsd.README       Mon Jul 28 05:54:18 2003 +0000
+++ b/share/mk/bsd.README       Mon Jul 28 07:03:43 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.128 2003/07/26 14:58:10 mrg Exp $
+#      $NetBSD: bsd.README,v 1.129 2003/07/28 07:03:43 lukem Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the new make "include" files for the BSD
@@ -61,8 +61,17 @@
 There are various make variables used during the build.  Basic rule for
 the variable naming scheme is as follows:
 
-MKxxx          Can be set to "no" by a user to disable functionality.
-               Usually defaults to "yes".
+MKxxx          Can be set to "no" to disable functionality, or
+               "yes" to enable it.
+               Usually defaults to "yes", although some variables
+               default to "no".
+               Due to make(1) implementation issues, if a temporary
+               command-line override of a mk.conf or bsd.own.mk setting
+               is required whilst still honouring a particular
+               Makefile's setting of MKxxx, use
+                       env MKxxx=value make
+               instead of
+                       make MKxxx=value
 
 NOxxx          If defined, disables a feature.
                Not intended for users.
@@ -101,6 +110,10 @@
 MKCRYPTO_RC5   If not "no", RC5 support will be built into libcrypto_rc5.a.
                Default: no
 
+MKCXXSUPCXX    If not "no", the support libraries needed for C++ programs
+               are set to `-lsupc++ -lm', rather than `-lstdc++ -lm'.
+               Default: no
+
 MKDOC          If "no", don't build or install the documentation.
                Default: yes
 
@@ -222,29 +235,29 @@
                infrastructure (libraries and support programs).
                Default: yes
 
-USE_HESIOD     If set to "no", disables building Hesiod support into
+USE_HESIOD     If "no", disables building Hesiod support into
                various system utilities/libraries that support it.
-               If MKHESIOD is set to "no", USE_HESIOD will also be
+               If MKHESIOD is "no", USE_HESIOD will also be
                forced to "no".
 
-USE_KERBEROS4  If set to "no", disables building Kerberos v4
+USE_KERBEROS4  If "no", disables building Kerberos v4
                support into various system utilities/libraries that
-               support it.  If MKKERBEROS4 is set to "no", USE_KERBEROS4
+               support it.  If MKKERBEROS4 is "no", USE_KERBEROS4
                will also be forced to "no".
 
-USE_KERBEROS   If set to "no", disables building Kerberos v4 or v5)
+USE_KERBEROS   If "no", disables building Kerberos v4 or v5)
                support into various system utilities/libraries that
-               support it.  If MKKERBEROS is set to "no", USE_KERBEROS
+               support it.  If MKKERBEROS is "no", USE_KERBEROS
                will also be forced to "no".
 
-USE_SKEY       If set to "no", disables building S/key authentication
+USE_SKEY       If "no", disables building S/key authentication
                support into various system utilities/libraries that
-               support it.  If MKSKEY is set to "no", USE_SKEY will
+               support it.  If MKSKEY is "no", USE_SKEY will
                also be forced to "no".
 
-USE_YP         If set to "no", disables building YP (NIS) support into
-               various system utilities/libraries that support it.  If
-               MKYP is set to "no", USE_YP will also be forced to "no".
+USE_YP         If "no", disables building YP (NIS) support into
+               various system utilities/libraries that support it.
+               If MKYP is "no", USE_YP will also be forced to "no".
 
 
 =-=-=-=-=   sys.mk   =-=-=-=-=
@@ -311,7 +324,7 @@
 MANINSTALL     Manual installation type: maninstall, catinstall, or both
 
 LDSTATIC       Control program linking; if set blank, link everything
-               dynamically. If set to "-static", link everything statically.
+               dynamically.  If set to "-static", link everything statically.
                If not set, programs link according to their makefile.
 
 LIBDIR         Base path for library installation.  [/usr/lib]
@@ -758,9 +771,6 @@
                compiler rather than the C compiler.  PROG_CXX overrides
                the value of PROG if PROG is also set.
 
-CXX_SUPCXX     If defined, the support libraries needed for this C++ program
-               are set to `-lsupc++ -lm', rather than `-lstdc++ -lm'.
-
 PROGNAME       The name that the above program will be installed as, if
                different from ${PROG}.
 
diff -r afc60e8e086f -r bb0694e195f4 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Mon Jul 28 05:54:18 2003 +0000
+++ b/share/mk/bsd.own.mk       Mon Jul 28 07:03:43 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.349 2003/07/28 05:54:18 matt Exp $
+#      $NetBSD: bsd.own.mk,v 1.350 2003/07/28 07:03:43 lukem Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -509,7 +509,7 @@
 
 #
 # Define MKxxx variables (which are either yes or no) for users
-# to set in /etc/mk.conf and override on the make commandline.
+# to set in /etc/mk.conf and override in the make environment.
 # These should be tested with `== "no"' or `!= "no"'.
 # The NOxxx variables should only be set by Makefiles.
 #
@@ -546,8 +546,8 @@
 #
 # MK* options which default to "no".
 #
-.for var in CRYPTO_IDEA CRYPTO_MDC2 CRYPTO_RC5 MANZ OBJDIRS SOFTFLOAT \
-       UNPRIVED UPDATE
+.for var in CRYPTO_IDEA CRYPTO_MDC2 CRYPTO_RC5 CXXSUPCXX \
+       MANZ OBJDIRS SOFTFLOAT UNPRIVED UPDATE
 MK${var}?=     no
 .endfor
 
diff -r afc60e8e086f -r bb0694e195f4 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Mon Jul 28 05:54:18 2003 +0000
+++ b/share/mk/bsd.prog.mk      Mon Jul 28 07:03:43 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.175 2003/07/27 14:49:23 mrg Exp $
+#      $NetBSD: bsd.prog.mk,v 1.176 2003/07/28 07:03:44 lukem Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -120,7 +120,7 @@
 
 .if defined(PROG_CXX)
 _CCLINK=       ${CXX}
-.if defined(CXX_SUPCXX)
+.if ${MKCXXSUPCXX} != "no"
 _SUPCXX=       -lsupc++ -lm
 .else
 _SUPCXX=       -lstdc++ -lm