system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update.

Browse Source 
* Makeconfig (rpath-link): Find libc.so.6 in $(common-objdir).
This commit is contained in:
Ulrich Drepper 1998-05-25 11:14:28 +00:00
parent b48abe3cc8
commit e72bfd87ec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
1998-05-25 Ulrich Drepper <drepper@cygnus.com> 1998-05-25 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (rpath-link): Find libc.so.6 in $(common-objdir).
* malloc/thread-m.h: Use __mutex_init function in mutex_init macro * malloc/thread-m.h: Use __mutex_init function in mutex_init macro
for Hurd. Patch by Mark Kettenis. for Hurd. Patch by Mark Kettenis.

14
Makeconfig
View File

@ -413,14 +413,11 @@ else
default-rpath = $(libdir) default-rpath = $(libdir)
endif endif
# This is how to find at build-time things that will be installed there. # This is how to find at build-time things that will be installed there.
rpath-link = $(common-objdir):$(mathobjdir):$(elfobjdir):$(nssobjdir):$(nisobjdir):$(dbobjdir):$(rtobjdir):$(resolvobjdir) rpath-dirs = math elf nss nis db2 rt resolv
mathobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)math) rpath-link = \
$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf) elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
nisobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nis)
dbobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)db2) dbobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)db2)
rtobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)rt)
resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
else else
link-libc = $(common-objpfx)libc.a $(gnulib) $(common-objpfx)libc.a link-libc = $(common-objpfx)libc.a $(gnulib) $(common-objpfx)libc.a
endif endif
@ -463,7 +460,6 @@ ifeq ($(elf),yes)
endif endif
csu-objpfx = $(common-objpfx)csu/ csu-objpfx = $(common-objpfx)csu/
elf-objpfx = $(common-objpfx)elf/ elf-objpfx = $(common-objpfx)elf/
db-objpfx = $(common-objpfx)db/
# How to run a program we just linked with our library. # How to run a program we just linked with our library.
# The program binary is assumed to be $(word 2,$^). # The program binary is assumed to be $(word 2,$^).
@ -657,6 +653,8 @@ endif
ifndef BUILD_CC ifndef BUILD_CC
BUILD_CC = $(CC) BUILD_CC = $(CC)
endif endif
move-if-change = $(SHELL) $(..)scripts/move-if-change
ifeq (yes, $(build-shared)) ifeq (yes, $(build-shared))
@ -746,7 +744,7 @@ ifneq (,$(findstring linuxthreads,$(add-ons)))
shared-thread-library = $(common-objpfx)linuxthreads/libpthread.so shared-thread-library = $(common-objpfx)linuxthreads/libpthread.so
static-thread-library = $(common-objpfx)linuxthreads/libpthread.a static-thread-library = $(common-objpfx)linuxthreads/libpthread.a
have-thread-library = yes have-thread-library = yes
rpath-link := $(rpath-link):$(common-objpfx)linuxthreads rpath-dirs += linuxthreads
endif endif
ifndef avoid-generated ifndef avoid-generated