changeset: 6721:89ae904a6b30
user: [email protected]
date: Fri Jul 08 19:08:45 2016 -0700
link: http://dev.mutt.org/hg/mutt/rev/89ae904a6b30
Fix conststrings compiler version string generation. (closes #3852)
The Makefile.am tries compiler flags -v, --version, and -V but
neglected to filter error messages if these flags aren't recognized.
diffs (16 lines):
diff -r ec4c113a3d2b -r 89ae904a6b30 Makefile.am
--- a/Makefile.am Fri Jul 08 18:52:56 2016 -0700
+++ b/Makefile.am Fri Jul 08 19:08:45 2016 -0700
@@ -99,9 +99,9 @@
conststrings.c: txt2c config.status
( \
- $(CC) -v || \
- $(CC) --version || \
- $(CC) -V || \
+ ($(CC) -v >/dev/null 2>&1 && $(CC) -v) || \
+ ($(CC) --version >/dev/null 2>&1 && $(CC) --version) || \
+ ($(CC) -V >/dev/null 2>&1 && $(CC) -V) || \
echo "unknown compiler"; \
) 2>&1 | ${srcdir}/txt2c.sh cc_version >conststrings_c
echo "$(CFLAGS)" | ${srcdir}/txt2c.sh cc_cflags >>conststrings_c
