about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-02-26 13:07:18 -0800
committerH.J. Lu <hjl.tools@gmail.com>2021-05-07 04:38:44 -0700
commit69e0a5eb0d5acb4b55dbef68b68fc4a10f2911af (patch)
treeee5ce63966af3238bb6974621bef463e3f9fff0e
parent3bf0b4f2cdc763141dd850be7588c32a720f5ce5 (diff)
downloadglibc-69e0a5eb0d5acb4b55dbef68b68fc4a10f2911af.tar.gz
glibc-69e0a5eb0d5acb4b55dbef68b68fc4a10f2911af.tar.xz
glibc-69e0a5eb0d5acb4b55dbef68b68fc4a10f2911af.zip
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).
-rw-r--r--iconv/Makefile5
1 files changed, 3 insertions, 2 deletions
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)