Expose linking against libsupport as make dependency

This ensures that tests are rebuilt when libsupport changes.

diff --git a/ChangeLog b/ChangeLog
index 0a75b9c9baa87c390e18f367d9d991d28689861e..f0fee26094751d83fb778b6eac05c08c336c99f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-13  Florian Weimer  <fweimer@redhat.com>
+
+       * Rules (binaries-shared-tests, binaries-pie-tests)
+       (binaries-static-tests): Link with $(link-extra-libs-tests).
+       * Makeconfig (+link-pie-tests, +link-static-tests, +link-tests):
+       Remove $(link-extra-libs-tests).
+
 2016-12-13  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
        * sysdeps/powerpc/powerpc64/multiarch/Makefile

diff --git a/Makeconfig b/Makeconfig
index be45c3a0b9a8a9b9382621c2ba3d41c80d2e0683..2d316accf32687f4c8c4348165466e49eeb0e921 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -415,8 +415,8 @@ $(+link-pie-before-libc) $(rtld-LDFLAGS) $(link-libc) $(+link-pie-after-libc)
 $(call after-link,$@)
 endef
 define +link-pie-tests
-$(+link-pie-before-libc) $(link-extra-libs-tests) \
-  $(rtld-tests-LDFLAGS) $(link-libc-tests) $(+link-pie-after-libc)
+$(+link-pie-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \
+                        $(+link-pie-after-libc)
 $(call after-link,$@)
 endef
 define +link-pie-printers-tests
@@ -442,8 +442,7 @@ $(+link-static-before-libc) $(link-libc-static) $(+link-static-after-libc)
 $(call after-link,$@)
 endef
 define +link-static-tests
-$(+link-static-before-libc) $(link-extra-libs-tests) \
-  $(link-libc-static-tests) $(+link-static-after-libc)
+$(+link-static-before-libc) $(link-libc-static-tests) $(+link-static-after-libc)
 $(call after-link,$@)
 endef
 endif
@@ -472,8 +471,8 @@ $(+link-before-libc) $(rtld-LDFLAGS) $(link-libc) $(+link-after-libc)
 $(call after-link,$@)
 endef
 define +link-tests
-$(+link-before-libc) $(link-extra-libs-tests) \
-  $(rtld-tests-LDFLAGS) $(link-libc-tests) $(+link-after-libc)
+$(+link-before-libc) $(rtld-tests-LDFLAGS) $(link-libc-tests) \
+                    $(+link-after-libc)
 $(call after-link,$@)
 endef
 define +link-printers-tests

diff --git a/Rules b/Rules
index de58a64a67c8cb4112d6137eea3eb5eefc0e4a74..9e02eb7ea71669f5d3c46db6386a06bb8d5208c7 100644 (file)
--- a/Rules
+++ b/Rules
@@ -189,6 +189,7 @@ endif
 
 ifneq "$(strip $(binaries-shared-tests))" ""
 $(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \
+  $(link-extra-libs-tests) \
   $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
   $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
        $(+link-tests)
@@ -196,6 +197,7 @@ endif
 
 ifneq "$(strip $(binaries-pie-tests))" ""
 $(addprefix $(objpfx),$(binaries-pie-tests)): %: %.o \
+  $(link-extra-libs-tests) \
   $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
   $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
        $(+link-pie-tests)
@@ -217,6 +219,7 @@ endif
 
 ifneq "$(strip $(binaries-static-tests))" ""
 $(addprefix $(objpfx),$(binaries-static-tests)): %: %.o \
+  $(link-extra-libs-tests) \
   $(sort $(filter $(common-objpfx)lib%,$(link-libc-static-tests))) \
   $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
        $(+link-static-tests)