From 69e0a5eb0d5acb4b55dbef68b68fc4a10f2911af Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 26 Feb 2021 13:07:18 -0800 Subject: 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). --- iconv/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'iconv') diff --git a/iconv/Makefile b/iconv/Makefile index 659857dd8c..a9b267c851 100644 --- 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) -- cgit 1.4.1