summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-05-21 06:06:51 +0000
committerRoland McGrath <roland@gnu.org>2001-05-21 06:06:51 +0000
commitf1d71039d18411fe5966b59b57c67a1b8dd009b4 (patch)
tree681d6cf30df45aca16a5598bb4b21e03a8203555 /Makeconfig
parent575f0d00f68d62706356a690beec310a9839d029 (diff)
downloadglibc-f1d71039d18411fe5966b59b57c67a1b8dd009b4.tar.gz
glibc-f1d71039d18411fe5966b59b57c67a1b8dd009b4.tar.xz
glibc-f1d71039d18411fe5966b59b57c67a1b8dd009b4.zip
* Makeconfig (sysdep-makeconfigs): Include any Makeconfig files
	found within $(add-ons) directories too.
	[linuxthreads add-on]: Move variable settings for linuxthreads
	to new file linuxthreads/Makeconfig.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig11
1 files changed, 3 insertions, 8 deletions
diff --git a/Makeconfig b/Makeconfig
index 996b971d61..26884f82d2 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -806,13 +806,6 @@ endif
 
 endif # build-shared
 
-ifneq (,$(findstring linuxthreads,$(add-ons)))
-shared-thread-library = $(common-objpfx)linuxthreads/libpthread.so
-static-thread-library = $(common-objpfx)linuxthreads/libpthread.a
-bounded-thread-library = $(common-objpfx)linuxthreads/libpthread_b.a
-have-thread-library = yes
-rpath-dirs += linuxthreads
-endif
 
 ifeq ($(elf),yes)
 dlfcn = dlfcn
@@ -880,7 +873,9 @@ $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \
 endif
 
 # Let sysdeps/ subdirs contain a Makeconfig fragment for us to include here.
-sysdep-makeconfigs := $(wildcard $(full_config_sysdirs:=/Makeconfig))
+sysdep-makeconfigs := $(wildcard $(patsubst %,$(..)%/Makeconfig,\
+					    $(config-sysdirs) $(add-ons)))
+
 ifneq (,$(sysdep-makeconfigs))
 include $(sysdep-makeconfigs)
 endif