* include/shlib-compat.h: Include <abi-versions.h> unconditionally.
#ifndef _SHLIB_COMPAT_H
#define _SHLIB_COMPAT_H 1
-#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
+/* Since there is just one set of .d files generated, we need to
+ include this unconditionally to have the dependency noticed properly. */
+#include <abi-versions.h> /* header generated by abi-versions.awk */
-# include <abi-versions.h> /* header generated by abi-versions.awk */
+#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
/* The file abi-versions.h (generated by scripts/abi-versions.awk) defines
symbols like `ABI_libm_GLIBC_2_0' for each version set in the source