about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2017-12-12 18:32:42 -0800
committerCarlos O'Donell <carlos@redhat.com>2017-12-12 18:34:33 -0800
commit243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad (patch)
tree2345d84c4ea17a4c6f297bf23bc6c0c7acb7a847 /elf
parent6f7c009282a5f7129e359c9ba8556e7e3ac229ec (diff)
downloadglibc-243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad.tar.gz
glibc-243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad.tar.xz
glibc-243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad.zip
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:

<command-line>:0:0: error: "USE_CRYPT" redefined [-Werror]
<command-line>: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 <carlos@redhat.com>
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile2
1 files changed, 1 insertions, 1 deletions
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