hints/{linux,macOS}.2020

A recent change was intended to allow specifying
  make CFLAGS=-O
on the command line to override our default of -g, but it didn't
work as intended.  foo=bar and foo+=bar don't work if foo has
been given a value on the command line.  The first was expected
behavior but the second wasn't, at least for me.  GNU make allows
'override foo+=bar' to cope with that.  (We're already implicitly
requiring GNU make for the linux and OSX hints.)

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 4de9a09575f594b3253d48cddeba854ba3a8516a..e5cefb7770b7dbebe36c19de229176b5abb40c82 100755 (executable)
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -1,4 +1,4 @@
-# NetHack 3.7  linux.2020 $NHDT-Date: 1599337708 2020/09/05 20:28:28 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.9 $
+# NetHack 3.7  linux.2020 $NHDT-Date: 1599593762 2020/09/08 19:36:02 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details. 
 #
@@ -53,42 +53,42 @@ GAMEGRP  = games
 
 #-INCLUDE multiw-2.2020
 
-CFLAGS+=-I../include -DNOTPARMDECL
+# MORECFLAGS is eventually appended to CFLAGS
+MORECFLAGS=-I../include -DNOTPARMDECL
+
 ifeq "$(CCISCLANG)" ""
 # get the version of gcc
 GCCGTEQ9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9)
 ifeq "$(GCCGTEQ9)" "1"
-CFLAGS+=-Wno-format-overflow
+MORECFLAGS+=-Wno-format-overflow
 endif  #gcc version greater than or equal to 9
 endif  #not clang
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
-#CFLAGS+=-Wunreachable-code
-#CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit \
+#MORECFLAGS+=-Wunreachable-code
+#MORECFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit \
 #      -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings
-#CFLAGS+=-DGCC_WARN
+#MORECFLAGS+=-DGCC_WARN
 
 # NetHack sources control
-CFLAGS+=-DDLB
-CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
-CFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\"
-CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
-CFLAGS+=-DTIMED_DELAY
-CFLAGS+=-DDUMPLOG
-CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
-#CFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
-CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
-# older binaries use NOCLIPPING, but that disables SIGWINCH
-#CFLAGS+=-DNOCLIPPING
-#CFLAGS+=-DNOMAIL
-#CFLAGS+=-DEXTRA_SANITY_CHECKS
-#CFLAGS+=-DEDIT_GETLIN
-#CFLAGS+=-DSCORE_ON_BOTL
-#CFLAGS+=-DMSGHANDLER
-#CFLAGS+=-DTTY_TILES_ESCCODES
-#CFLAGS+=-DTTY_SOUND_ESCCODES
-
-CFLAGS+= $(WINCFLAGS)  #WINCFLAGS set from multiw-2.2020
+MORECFLAGS+=-DDLB
+MORECFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
+MORECFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\"
+MORECFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
+MORECFLAGS+=-DTIMED_DELAY
+MORECFLAGS+=-DDUMPLOG
+MORECFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
+#MORECFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
+MORECFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
+#MORECFLAGS+=-DNOMAIL
+#MORECFLAGS+=-DEXTRA_SANITY_CHECKS
+#MORECFLAGS+=-DEDIT_GETLIN
+#MORECFLAGS+=-DSCORE_ON_BOTL
+#MORECFLAGS+=-DMSGHANDLER
+#MORECFLAGS+=-DTTY_TILES_ESCCODES
+#MORECFLAGS+=-DTTY_SOUND_ESCCODES
+
+MORECFLAGS+= $(WINCFLAGS)      #WINCFLAGS set from multiw-2.2020
 
 VARDATND =
 VARDATND0 =
@@ -122,7 +122,7 @@ X11CFLAGS = -I/opt/X11/include
 # avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
 X11CFLAGS += -Wno-variadic-macros
 ifdef USE_XPM
-CFLAGS += -DUSE_XPM
+MORECFLAGS += -DUSE_XPM
 WINX11LIB += -lXpm
 VARDATND0 += rip.xpm
 endif
@@ -161,6 +161,14 @@ WINOBJ = $(sort $(WINOBJ0))
 # prevent duplicates in VARDATND if both X11 and Qt are being supported
 VARDATND += $(sort $(VARDATND0))
 
+# if CFLAGS=foo was specified on the command line, CFLAGS+=$(MORECFLAGS)
+# would be ignored without 'override'; we want to allow CFLAGS=-g vs -O
+# on the command line without having to specify all the other stuff
+#
+override CFLAGS+=$(MORECFLAGS)
+#
+
+
 #PREFIX=/usr
 PREFIX=$(wildcard ~)/nh/install
 HACKDIR=$(PREFIX)/games/lib/$(GAME)dir

diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index a5777a0f88fbd3588d31b07efa119975b91f72e8..212c8581be7fca9cf579609f73f605e88e8d4d5d 100755 (executable)
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -1,4 +1,4 @@
-# NetHack 3.7  macOS.2020 $NHDT-Date: 1599337708 2020/09/05 20:28:28 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.71 $
+# NetHack 3.7  macOS.2020 $NHDT-Date: 1599593767 2020/09/08 19:36:07 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.72 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -55,10 +55,12 @@ endif
 
 #-INCLUDE multiw-2.2020
 
-CFLAGS+=-I../include -DNOTPARMDECL
+# MORECFLAGS is eventually appended to CFLAGS
+MORECFLAGS=-I../include -DNOTPARMDECL
+
 ifndef WANT_WIN_QT
 #      these are normally used when compiling nethack's core
-CFLAGS+=-ansi -pedantic -Wno-long-long
+MORECFLAGS+=-ansi -pedantic -Wno-long-long
 #      but -ansi forces -std=c90 for C or -std=c++98 for C++;
 #      win/Qt/qt_*.cpp compiled with C++98 semantics trigger
 #In file included from .../qt5/include/QtCore/qglobal.h:105:
@@ -68,32 +70,30 @@ CFLAGS+=-ansi -pedantic -Wno-long-long
 endif
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
-#CFLAGS+=-Wunreachable-code
-CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit \
+#MORECFLAGS+=-Wunreachable-code
+MORECFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit \
        -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings
-CFLAGS+=-DGCC_WARN
+MORECFLAGS+=-DGCC_WARN
 
 # NetHack sources control
-CFLAGS+=-DDLB
-CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
-CFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB
-CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
-#CFLAGS+=-DTIMED_DELAY
-#CFLAGS+=-DDUMPLOG
-#CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
-CFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
-#CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
-# older binaries use NOCLIPPING, but that disables SIGWINCH
-#CFLAGS+=-DNOCLIPPING
-CFLAGS+=-DNOMAIL
-#CFLAGS+=-DEXTRA_SANITY_CHECKS
-#CFLAGS+=-DEDIT_GETLIN
-#CFLAGS+=-DSCORE_ON_BOTL
-#CFLAGS+=-DMSGHANDLER
-#CFLAGS+=-DTTY_TILES_ESCCODES
-#CFLAGS+=-DTTY_SOUND_ESCCODES
-
-CFLAGS+= $(WINCFLAGS)   #WINCFLAGS set from multiw-2.2020
+MORECFLAGS+=-DDLB
+MORECFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
+MORECFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB
+MORECFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
+#MORECFLAGS+=-DTIMED_DELAY
+#MORECFLAGS+=-DDUMPLOG
+#MORECFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
+MORECFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
+#MORECFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
+MORECFLAGS+=-DNOMAIL
+#MORECFLAGS+=-DEXTRA_SANITY_CHECKS
+#MORECFLAGS+=-DEDIT_GETLIN
+#MORECFLAGS+=-DSCORE_ON_BOTL
+#MORECFLAGS+=-DMSGHANDLER
+#MORECFLAGS+=-DTTY_TILES_ESCCODES
+#MORECFLAGS+=-DTTY_SOUND_ESCCODES
+
+MORECFLAGS+= $(WINCFLAGS)   #WINCFLAGS set from multiw-2.2020
 
 VARDATND =
 VARDATND0 =
@@ -127,7 +127,7 @@ X11CFLAGS = -I/opt/X11/include
 # avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
 X11CFLAGS += -Wno-variadic-macros
 ifdef USE_XPM
-CFLAGS += -DUSE_XPM
+MORECFLAGS += -DUSE_XPM
 WINX11LIB += -lXpm
 VARDATND0 += rip.xpm
 endif
@@ -165,6 +165,14 @@ WINOBJ = $(sort $(WINOBJ0))
 # prevent duplicates in VARDATND if both X11 and Qt are being supported
 VARDATND += $(sort $(VARDATND0))
 
+# if CFLAGS=foo was specified on the command line, CFLAGS+=$(MORECFLAGS)
+# would be ignored without 'override'; we want to allow CFLAGS=-g vs -O
+# on the command line without having to specify all the other stuff
+#
+override CFLAGS+=$(MORECFLAGS)
+#
+
+
 WANT_BUNDLE=1
 ifdef WANT_SHARE_INSTALL
 # if $GAMEUID is root, we install into roughly proper Mac locations, otherwise