From 45d1957ce8b568dac565d68c9574d4fa99a85b73 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Thu, 3 Aug 2017 23:39:26 -0700 Subject: [PATCH] build: use the appropriate single file include option with xlc * configure.ac: Set USE_XLC_INCLUDE when __xlc__ is defined. * src/local.mk: Use it to select the appropriate include option. Reported by Michael Felt. --- configure.ac | 12 ++++++++++++ src/local.mk | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 73e445d02a..80bda2b6a9 100644 --- a/configure.ac +++ b/configure.ac @@ -500,6 +500,18 @@ fi CFLAGS=$ac_save_CFLAGS LDFLAGS=$ac_save_LDFLAGS +# Detect when using xlc to determine whether to use -qinclude= +AC_CACHE_CHECK([whether the system supports xlc include], [utils_cv_xlc], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifndef __xlc__ + #error "not xlc" + #endif + ]])], + [utils_cv_xlc=yes], + [utils_cv_xlc=no])]) +AM_CONDITIONAL([USE_XLC_INCLUDE], [test "$utils_cv_xlc" = yes]) + ############################################################################ dnl Autogenerated by the 'gen-lists-of-programs.sh' auxiliary script. diff --git a/src/local.mk b/src/local.mk index 9b2b172d26..1cb685906c 100644 --- a/src/local.mk +++ b/src/local.mk @@ -397,8 +397,14 @@ 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) -src_b2sum_CPPFLAGS = -include config.h -DHASH_ALGO_BLAKE2=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_SOURCES = src/md5sum.c \ src/blake2/blake2.h src/blake2/blake2-impl.h \ src/blake2/blake2b-ref.c \ -- 2.47.2