about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile1
-rw-r--r--include/crypt.h3
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d49f22153a..cbd4409a46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-28  Carlos O'Donell  <carlos@redhat.com>
+
+	* elf/Makefile (CFALGS-tst-linkall-static): Remove.
+	* include/crypt.h: New file.
+
 2016-10-28  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* dlfcn/bug-atexit3-lib.cc (write_message): New function, copied
diff --git a/elf/Makefile b/elf/Makefile
index 057a19fb2b..82c7e0559d 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1280,7 +1280,6 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig
 
 $(objpfx)tst-dlsym-error: $(libdl)
 
-CFLAGS-tst-linkall-static.c = -I../crypt
 $(objpfx)tst-linkall-static: \
   $(common-objpfx)math/libm.a \
   $(common-objpfx)crypt/libcrypt.a \
diff --git a/include/crypt.h b/include/crypt.h
new file mode 100644
index 0000000000..544551da21
--- /dev/null
+++ b/include/crypt.h
@@ -0,0 +1,3 @@
+#ifndef _CRYPT_H
+# include <crypt/crypt.h>
+#endif /* _CRYPT_H */