diff options
| -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 |