summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stdlib/Makefile8
-rwxr-xr-xstdlib/tst-fmtmsg.sh8
2 files changed, 10 insertions, 6 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 61c35ebf78..6faa1c54f7 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -141,7 +141,11 @@ test-canon-ARGS = --test-dir=${common-objpfx}stdlib
tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata
# Run a test on the header files we use.
-tests: $(objpfx)isomac.out $(objpfx)tst-fmtmsg.out
+tests: $(objpfx)isomac.out
+
+ifeq (no,$(cross-compiling))
+tests: $(objpfx)tst-fmtmsg.out
+endif
$(objpfx)isomac.out: $(objpfx)isomac
$(dir $<)$(notdir $<) '$(CC)' \
@@ -151,4 +155,4 @@ $(objpfx)isomac: isomac.c
$(native-compile)
$(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- $(SHELL) -e $< $(common-objpfx) $(common-objpfx)stdlib/
+ $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
diff --git a/stdlib/tst-fmtmsg.sh b/stdlib/tst-fmtmsg.sh
index 6f083cab15..7f1b52ed3f 100755
--- a/stdlib/tst-fmtmsg.sh
+++ b/stdlib/tst-fmtmsg.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Test of fmtmsg function family.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
#
# The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,10 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
common_objpfx=$1
-objpfx=$2
+run_program_prefix=$2
+objpfx=$3
-test="${common_objpfx}elf/ld.so --library-path $common_objpfx \
-${objpfx}tst-fmtmsg"
+test="${run_program_prefix} ${objpfx}tst-fmtmsg"
out=${objpfx}tst-fmtmsg.out
LC_ALL=C