diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2017-12-12 18:32:42 -0800 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2017-12-12 18:34:33 -0800 |
| commit | 243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad (patch) | |
| tree | 2345d84c4ea17a4c6f297bf23bc6c0c7acb7a847 | |
| parent | 6f7c009282a5f7129e359c9ba8556e7e3ac229ec (diff) | |
| download | glibc-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>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f560b2a832..22df17b671 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-12-12 Carlos O'Donell <carlos@redhat.com> + + * elf/Makefile [$(nss-crypt)$(static-nss-crypt) == yesno] + (CFLAGS-tst-linkall-static.c): Undefine USE_CRYPT first. + 2017-12-12 Joseph Myers <joseph@codesourcery.com> * 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 |