2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d1c05f6ba..1842eb5de1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-26  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makerules (shlib.lds): Make sure that ld doesn't try to link
+	anything while generating the linker script.
+
 2003-10-31  Roland McGrath  <roland@redhat.com>
 
 	* locale/lc-ctype.c (_nl_postload_ctype): Update _nl_global_locale's
diff --git a/Makerules b/Makerules
index 500d1af024..d1bef8c983 100644
--- a/Makerules
+++ b/Makerules
@@ -479,6 +479,7 @@ ifeq (yes,$(elf))
 # not for shared objects
 $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
 	$(LINK.o) -shared -Wl,-O1 \
+		  -nostdlib -nostartfiles \
 		  $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \
 		  -Wl,--verbose 2>&1 | \
 	  sed > $@T \