aboutsummaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-10-11 03:34:46 +0000
committerRoland McGrath <roland@gnu.org>1995-10-11 03:34:46 +0000
commit8e3cc80f6d4f69ce003c82d3561ac324692792ad (patch)
tree46dcca133fd8477dee761d12ae692fda7cfd9ff3 /Makeconfig
parentb122c7038e826eeabbc0118612b988c1a0f5b991 (diff)
downloadglibc-8e3cc80f6d4f69ce003c82d3561ac324692792ad.zip
glibc-8e3cc80f6d4f69ce003c82d3561ac324692792ad.tar.gz
glibc-8e3cc80f6d4f69ce003c82d3561ac324692792ad.tar.bz2
Tue Oct 10 23:08:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* Makerules (build-shlib): Pass -rpath and -rpath-link options. (LDFLAGS-c.so): Don't pass -dynamic-linker here. * Makeconfig (+link): Pass $(sysdep-LDFLAGS). (link-libc): Pass -rpath and -rpath-link options. * MakeTAGS (all-dirs): Omit CVS directories. Specify vpath directives to find source files in $(all-dirs). (sources, headers): Append sources and headers from $(all-dist) to these. (all-dist): Filter them out of this. (all-headers, all-sources): Use $(shell find ...) instead of $(wildcard ...). * sysdeps/mach/hurd/Makefile (sysdep-LDFLAGS): New variable; pass -rpath-link. * hurd/hurdexec.c: Pass poly and dealloc args to __file_exec. * elf/Makefile (install-others): Add missing $. * mach/Makefile ($(objpfx)errsystems.c): Rule reenabled.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig12
1 files changed, 7 insertions, 5 deletions
diff --git a/Makeconfig b/Makeconfig
index e0ec754..25740cb 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -267,10 +267,11 @@ endif
# Command for linking programs with the C library.
ifndef +link
-+link = $(CC) -nostdlib -nostartfiles $(config-LDFLAGS) $(LDFLAGS) -o $@ \
- $(addprefix $(csu-objpfx),start.o $(+preinit)) \
- $(^:$(common-objpfx)libc.a=$(link-libc)) \
- $(addprefix $(csu-objpfx),$(+postinit))
++link = $(CC) -nostdlib -nostartfiles -o $@ \
+ $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) \
+ $(addprefix $(csu-objpfx),start.o $(+preinit)) \
+ $(^:$(common-objpfx)libc.a=$(link-libc)) \
+ $(addprefix $(csu-objpfx),$(+postinit))
endif
ifndef config-LDFLAGS
ifeq (yes,$(build-shared))
@@ -279,7 +280,8 @@ endif
endif
ifndef link-libc
ifeq (yes,$(build-shared))
-link-libc = -L$(common-objdir) -lc $(gnulib)
+link-libc = -Wl,-rpath-link=$(common-objdir) -Wl,-rpath=$(libdir) \
+ $(common-objpfx)libc.so $(gnulib)
else
link-libc = $(common-objpfx)libc.a $(gnulib) $(common-objpfx)libc.a
endif