summaryrefslogtreecommitdiff
path: root/src/local.mk
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-05-15 12:42:23 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-05-15 12:42:58 -0700
commit5f261e239f4cdeb0b091228dc62f10fd5e9a9991 (patch)
tree34d46cec67c57a616c40044d962c7ea623548582 /src/local.mk
parent5b96efab90bd7312e6c4195fc056e2a6e664a380 (diff)
downloadcoreutils-5f261e239f4cdeb0b091228dc62f10fd5e9a9991.tar.gz
b2sum: port to HP-UX aCC
Its support for the -include option is flaky. Problem reported by Michael Osipov (Bug#35650). Plus, we could run into other compilers that don’t support any option like -include. Change the code so that -include is not needed. Although this causes us to depart from the upstream version, we’re already doing that for other reasons. * configure.ac (USE_XLC_INCLUDE): Remove, as there’s no guarantee a compiler will support something like -include. * src/blake2/b2sum.c [HAVE_CONFIG_H]: Include <config.h>. * src/local.mk (src_b2sum_CPPFLAGS): Add -DHAVE_CONFIG_H. Do not use -include or a substitute.
Diffstat (limited to 'src/local.mk')
-rw-r--r--src/local.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/local.mk b/src/local.mk
index a69d40521..763c8a01c 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -399,14 +399,7 @@ src_sha384sum_SOURCES = src/md5sum.c
src_sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
src_sha512sum_SOURCES = src/md5sum.c
src_sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
-# Include the file on the command line to avoid modifying
-# the blake2 upstream source
-if USE_XLC_INCLUDE
-src_b2sum_CPPFLAGS = -qinclude=config.h
-else
-src_b2sum_CPPFLAGS = -include config.h
-endif
-src_b2sum_CPPFLAGS += -DHASH_ALGO_BLAKE2=1 $(AM_CPPFLAGS)
+src_b2sum_CPPFLAGS = -DHASH_ALGO_BLAKE2=1 -DHAVE_CONFIG_H $(AM_CPPFLAGS)
src_b2sum_SOURCES = src/md5sum.c \
src/blake2/blake2.h src/blake2/blake2-impl.h \
src/blake2/blake2b-ref.c \