summaryrefslogtreecommitdiff
path: root/test/Rules.mak
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-02 09:17:30 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-02 09:17:30 -0700
commitaae3eb9256affb18cff589b52ee26e0a4e557bbd (patch)
tree003711a54e7dfbde0b50979e2942fd3e0d3451c8 /test/Rules.mak
parentef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff)
parent2864786ad884369ab5397be864e9f43d32bc2726 (diff)
Merge commit 'origin/master' into nptl
Conflicts: Makefile.in extra/Configs/Config.in libc/sysdeps/linux/common/bits/kernel-features.h libc/sysdeps/linux/common/poll.c libc/sysdeps/linux/common/sysdep.h libc/sysdeps/linux/sh/sysdep.h Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/Rules.mak')
-rw-r--r--test/Rules.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Rules.mak b/test/Rules.mak
index 9d5bd8296..29b551fa1 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -84,7 +84,7 @@ LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib -Wl,-rpath-link,$(
UCLIBC_LDSO_ABSPATH=$(shell pwd)
ifdef TEST_INSTALLED_UCLIBC
LDFLAGS += -Wl,-rpath,./
-UCLIBC_LDSO_ABSPATH=$(SHARED_LIB_LOADER_PREFIX)
+UCLIBC_LDSO_ABSPATH=$(RUNTIME_PREFIX)$(MULTILIB_DIR)
endif
ifeq ($(findstring -static,$(LDFLAGS)),)