From 243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Tue, 12 Dec 2017 18:32:42 -0800 Subject: [PATCH] Fix testing with nss-crypt. A glibc master build with --enable-nss-crypt using the NSS crypto libraries fails during make check with the following error: :0:0: error: "USE_CRYPT" redefined [-Werror] :0:0: note: this is the location of the previous definition This is caused by commit 36975e8e7ea227f7006abdc722ecfefe2079429b by H.J. Lu which replaces all = with +=. The fix is to undefine USE_CRYPT before defining it to zero. Committed as an obvious fix. Fixes the build issue on x86_64 with no regressions. Signed-off-by: Carlos O'Donell --- ChangeLog | 5 +++++ elf/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f560b2a832..22df17b671 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-12-12 Carlos O'Donell + + * elf/Makefile [$(nss-crypt)$(static-nss-crypt) == yesno] + (CFLAGS-tst-linkall-static.c): Undefine USE_CRYPT first. + 2017-12-12 Joseph Myers * soft-fp/fmadf4.c: Move to .... diff --git a/elf/Makefile b/elf/Makefile index 7b8f325ccf..8563555079 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -391,7 +391,7 @@ CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=1 # library, then we exclude the use of crypt functions in the test. # We similarly exclude libcrypt.a from the static link (see below). ifeq (yesno,$(nss-crypt)$(static-nss-crypt)) -CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=0 +CFLAGS-tst-linkall-static.c += -UUSE_CRYPT -DUSE_CRYPT=0 endif include ../Rules -- 2.34.1