qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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).
This commit is contained in:
H.J. Lu 2021-02-26 13:07:18 -08:00
parent 3bf0b4f2cd
commit 69e0a5eb0d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iconv/Makefile
View File

@ -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)