about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makerules14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a6f1970d83..eed8b16fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-02  Andreas Schwab  <schwab@suse.de>
+
+	* Makerules (build-module): Make sure exit codes get checked
+	properly and remove unnecessary slashes.
+
 2001-04-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/get_clockfreq.c (__get_clockfreq):
diff --git a/Makerules b/Makerules
index c37ae5567e..77951f3640 100644
--- a/Makerules
+++ b/Makerules
@@ -462,17 +462,17 @@ ifeq (yes,$(elf))
 # not for shared objects
 define build-module
 $(build-module-helper) \
-	  -o $@.new $(csu-objpfx)/abi-note.o -Wl,--verbose \
+	  -o $@.new $(csu-objpfx)abi-note.o -Wl,--verbose \
 	  $(LDLIBS-$(@F:lib%.so=%).so) 2>&1 | \
 	  sed -e '/^=========/,/^=========/!d;/^=========/d' \
 	      -e 's/^.*\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \
-	  > $@.lds; \
-	  rm -f $@.new; \
-	  $(build-module-helper) -o $@ -T $@.lds \
-	  -Wl,--whole-archive $(csu-objpfx)/abi-note.o \
+	  > $@.lds
+rm -f $@.new
+$(build-module-helper) -o $@ -T $@.lds \
+	  -Wl,--whole-archive $(csu-objpfx)abi-note.o \
 	  $(filter-out $(map-file) $(+preinit) $(+postinit),$^) \
-	  $(no-whole-archive) $(LDLIBS-$(@F:lib%.so=%).so); \
-	  rm -f $@.lds
+	  $(no-whole-archive) $(LDLIBS-$(@F:lib%.so=%).so)
+rm -f $@.lds
 endef
 else
 define build-module