summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-08-26 17:03:09 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-08-26 17:03:09 +0000
commit9d7a22d351d45808aa88224367cc1dd30e518705 (patch)
treee6b4ce1becdbc3b9b849db2c0c784a9be7001e48 /test
parent94a9a5a20973964c88bf91110d587eaef693f522 (diff)
Fixes from gentoo.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile8
-rw-r--r--test/Rules.mak2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile
index 397cc42b7..203484290 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -22,19 +22,19 @@ TOPDIR=../
.EXPORT_ALL_VARIABLES:
-ALL_SUBDIRS = args assert ctype dlopen pwd_grp signal silly stdlib string unistd crypt #misc
+ALL_SUBDIRS = args assert ctype pwd_grp signal silly stdlib string unistd crypt #misc
DIRS = $(ALL_SUBDIRS)
#ifeq ($(TARGET_ARCH), $(HOST_ARCH))
# DIRS = $(ALL_SUBDIRS)
#else
# DIRS =
#endif
-ifeq ($(strip $(HAVE_SHARED)),true)
- ifeq ($(strip $(DODYNAMIC)),true)
+ifeq ($(HAVE_SHARED),y)
+ ifeq ($(BUILD_UCLIBC_LDSO),y)
DIRS += dlopen
endif
endif
-ifeq ($(strip $(INCLUDE_THREADS)),true)
+ifeq ($(UCLIBC_HAS_THREADS),y)
DIRS += pthread
endif
diff --git a/test/Rules.mak b/test/Rules.mak
index dcba2452a..141cf10f6 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -44,7 +44,7 @@ export TARGET_ARCH
CROSS=
CC= $(CROSS)gcc
STRIPTOOL=strip
-LDD=../$(TESTDIR)ldso/util/ldd
+LDD=../$(TOPDIR)/utils/ldd
RM= rm -f