about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--elf/Makefile2
-rw-r--r--posix/Makefile2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 92f7c934fa..37ac2d7250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-02-10  Andreas Jaeger  <aj@suse.de>
 
+	* stdlib/Makefile (tests): Don't run tst-fmtmsg when
+	cross-compiling.
+	($(objpfx)tst-fmtmsg.out): Pass run-program-prefix.
+
+	* stdlib/tst-fmtmsg.sh (test): Use run_program_prefix for static
+	only builds.
+
+	* elf/Makefile (tests): Only run tst-pathopt with shared libs.
+
 	* posix/Makefile: Fix typo, it's build-static-nss.
 
 	* iconv/Makefile (extra-objs): New.
diff --git a/elf/Makefile b/elf/Makefile
index 82800cbef5..39f14783be 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -245,7 +245,9 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
 generated += $(addsuffix .so,$(strip $(modules-names)))
 
+ifeq (yes,$(build-shared))
 tests: $(objpfx)tst-pathopt.out
+endif
 
 $(objpfx)testobj1.so: $(libdl)
 $(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(libdl)
diff --git a/posix/Makefile b/posix/Makefile
index 9b2bd10e8e..8b70b62b37 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -86,7 +86,7 @@ generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \
 
 include ../Rules
 
-ifeq (yes,$(built-static-nss))
+ifeq (yes,$(build-static-nss))
 # We need it for "make check" only. We can skip them if they haven't
 # been built yet during "make".
 otherlibs += $(wildcard $(nssobjdir)/libnss_files.a \