iconv: Use $(run-program-prefix) for running iconv (bug 32197)

With --enable-hardcoded-path-in-tests, $(test-program-prefix)
does not redirect to the built glibc, but we need to run
iconv (the program) against the built glibc even with
--enable-hardcoded-path-in-tests, as it is using the ABI
path for the dynamic linker (as an installed program).
Use $(run-program-prefix) instead.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>

diff --git a/iconv/Makefile b/iconv/Makefile
index c9af0c4d44cae7fb316823dbf7e9e97e22b62956..de9d964ed3c762bf1a3a650dbd12828b09400e65 100644 (file)
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -153,14 +153,14 @@ $(objpfx)tst-translit-mchar.out: tst-translit-mchar.sh \
 
 $(objpfx)tst-iconv_prog-buffer.out: \
   tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
-       $(BASH) $< $(common-objdir) '$(test-program-prefix)' > $@; \
+       $(BASH) $< $(common-objdir) '$(run-program-prefix)' > $@; \
        $(evaluate-test)
 $(objpfx)tst-iconv_prog-buffer-tiny.out: \
   tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
-       $(BASH) $< $(common-objdir) '$(test-program-prefix)' \
+       $(BASH) $< $(common-objdir) '$(run-program-prefix)' \
          '--buffer-size=1' > $@; \
        $(evaluate-test)
 $(objpfx)tst-iconv_prog-buffer-large.out: \
   tst-iconv_prog-buffer.sh $(objpfx)iconv_prog
-       $(BASH) $< $(common-objdir) '$(test-program-prefix)' '' '22' > $@; \
+       $(BASH) $< $(common-objdir) '$(run-program-prefix)' '' '22' > $@; \
        $(evaluate-test)