Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477]

When glibc is configured with --enable-hardcoded-path-in-tests,
"make xcheck" failed with

...
env GCONV_PATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconvdata LOCPATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/localedata LC_ALL=C  /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig  --output=$tmp --nostdlib /usr/lib64/gconv;
...
/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig)
...
FAIL: iconv/test-iconvconfig

Since $(objpfx)iconvconfig is an installed program, run it with
$(run-program-prefix).

diff --git a/iconv/Makefile b/iconv/Makefile
index 659857dd8c06c2b43ba7e4729cd043cf8cebef84..a9b267c8512686baf71ae465c09a62f348cd444c 100644 (file)
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -95,11 +95,12 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
 $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
 $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
 
-$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig
+$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig
        (set -e; \
         tmp=$(objpfx)gconv-modules.cache.$$$$; \
         rm -f $$tmp; \
-        $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \
+        $(run-program-prefix) $(objpfx)iconvconfig \
+               --output=$$tmp --nostdlib $(inst_gconvdir); \
         cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \
         rm -f $$tmp) > $@; \
        $(evaluate-test)