diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
| commit | 519f6620457d9f84d0125c0c7d01abebaae8efaa (patch) | |
| tree | 28e2b20214b72aa7a633a5910dba7d2388620a78 /crypt/Makefile | |
| parent | 74f331b3ccf81cf9404be03e62bde9efcc0878c2 (diff) | |
| parent | 68e2fa8ed9dbf0edfdaed0310801e764c12af46e (diff) | |
Merge commit 'refs/top-bases/t/libc_cleanup' into t/libc_cleanup
Diffstat (limited to 'crypt/Makefile')
| -rw-r--r-- | crypt/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/crypt/Makefile b/crypt/Makefile index c8b8579a93..3811b6e298 100644 --- a/crypt/Makefile +++ b/crypt/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2016 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -32,14 +32,12 @@ libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \ tests := cert md5c-test sha256c-test sha512c-test badsalttest -ifeq ($(crypt-in-libc),yes) -routines += $(libcrypt-routines) -endif - ifeq ($(nss-crypt),yes) -CPPFLAGS-sha256-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir) -CPPFLAGS-sha512-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir) -CPPFLAGS-md5-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir) +nss-cpp-flags := -DUSE_NSS \ + -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir) +CPPFLAGS-sha256-crypt.c += $(nss-cpp-flags) +CPPFLAGS-sha512-crypt.c += $(nss-cpp-flags) +CPPFLAGS-md5-crypt.c += $(nss-cpp-flags) LDLIBS-crypt.so = -lfreebl3 else libcrypt-routines += md5 sha256 sha512 |