Skip to content

Commit

Permalink
* iconv/Makefile (test-iconvconfig): New target.
Browse files Browse the repository at this point in the history
	[$(cross-compiling) != yes] (xtests): Depend on it.
  • Loading branch information
Roland McGrath committed Dec 19, 2004
1 parent 6a361b2 commit ff06ca8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2004-12-19 Roland McGrath <roland@redhat.com>

* iconv/Makefile (test-iconvconfig): New target.
[$(cross-compiling) != yes] (xtests): Depend on it.

* iconv/iconvconfig.c (nostdlib, output_file, output_file_len):
New variables.
(options, parse_opt, main): Take new options --nostdlib and
Expand Down
12 changes: 12 additions & 0 deletions iconv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,15 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)

$(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
$(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)

ifneq ($(cross-compiling),yes)
xtests: test-iconvconfig
endif

.PHONY: test-iconvconfig
test-iconvconfig: /dev/null $(objpfx)iconvconfig
tmp=$(objpfx)gconv-modules.cache.$$$$; \
rm -f $$tmp; \
$(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir) && \
cmp $$tmp $(inst_gconvdir)/gconv-modules.cache && \
rm -f $$tmp

0 comments on commit ff06ca8

Please sign in to comment.