about summary refs log tree commit diff
path: root/Makerules
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 /Makerules
parentb122c7038e826eeabbc0118612b988c1a0f5b991 (diff)
downloadglibc-8e3cc80f6d4f69ce003c82d3561ac324692792ad.tar.gz
glibc-8e3cc80f6d4f69ce003c82d3561ac324692792ad.tar.xz
glibc-8e3cc80f6d4f69ce003c82d3561ac324692792ad.zip
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 'Makerules')
-rw-r--r--Makerules8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makerules b/Makerules
index 1899eb7f89..56f8cc89e6 100644
--- a/Makerules
+++ b/Makerules
@@ -553,10 +553,10 @@ ifeq (yes,$(build-shared))
 lib%.so: lib%_pic.a; $(build-shlib)
 
 define build-shlib
-$(LINK.o) -shared -o $@ -Wl,-soname \
-	  -Wl,lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \
+$(LINK.o) -shared -o $@ $(sysdep-LDFLAGS) $(config-LDFLAGS)  \
+	  -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \
 	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
-	  -L$(firstword $(objdir) .)  -L$(common-objpfx:%/=%) \
+	  -Wl,-rpath-link=$(common-objdir) -Wl,-rpath=$(libdir) \
 	  -Wl,--whole-archive $^ $(LDLIBS-$(@F:lib%.so=%).so)
 endef
 
@@ -565,7 +565,7 @@ endef
 # since we define our own `.init' section specially.
 LDFLAGS-c.so = -nostdlib -nostartfiles
 # Give libc.so an entry point and make it directly runnable itself.
-LDFLAGS-c.so += -Wl,-dynamic-linker -Wl,/lib/ld.so -e __libc_print_version
+LDFLAGS-c.so += -e __libc_print_version
 # Use our own special initializer and finalizer files for libc.so.
 elfobjdir := $(firstword $(objdir) $(..)elf)
 $(common-objpfx)libc.so: $(elfobjdir)/soinit.so \