summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-08-02 05:27:50 +0000
committerRoland McGrath <roland@gnu.org>1996-08-02 05:27:50 +0000
commite75154a665018d5756196275634704c95476ea6b (patch)
tree0c8f889a29304e0cc86611c629f1b620d16cf8a7 /Makeconfig
parent9ebb936d991a6e08da05e5a942465d64cac39f86 (diff)
downloadglibc-e75154a665018d5756196275634704c95476ea6b.tar.gz
Remade for alpha-1.93cvs/libc-960802
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig16
1 files changed, 9 insertions, 7 deletions
diff --git a/Makeconfig b/Makeconfig
index 23dca2cc4c..de883ccea5 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -298,9 +298,9 @@ endif
ifndef +link
+link = $(CC) -nostdlib -nostartfiles -o $@ \
$(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) \
- $(addprefix $(csu-objpfx),start.o $(+preinit)) \
+ $(+preinit) \
$(filter-out $(common-objpfx)libc%,$^) $(link-libc) \
- $(addprefix $(csu-objpfx),$(+postinit))
+ $(+postinit)
endif
ifndef config-LDFLAGS
ifeq (yes,$(build-shared))
@@ -334,8 +334,8 @@ ifndef gnulib
gnulib := -lgcc
endif
ifeq ($(elf),yes)
-+preinit = crti.o
-+postinit = crtn.o
++preinit = $(addprefix $(csu-objpfx),crti.o)
++postinit = $(addprefix $(csu-objpfx),crtn.o)
endif
ifdef objpfx
csu-objpfx = $(objpfx)
@@ -521,10 +521,12 @@ $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \
test -n "$$versions" || continue; \
case '$(config-machine)-$(config-vendor)-$(config-os)' in $$conf)\
for v in $$versions; do \
- lib="$${v%%=*}"; if eval "test -z \"\$$vers_lib$$lib\""; then \
+ lib=`echo $$v | sed 's/=.*$$//'`; \
+ if eval "test -z \"\$$vers_lib$$lib\""; then \
eval vers_lib$${lib}=yes; \
- echo $$lib.so-version=.$${v##$$lib=}; fi; \
- done ;; esac; done > $@T
+ echo $$v | sed "s/^.*=/$$lib.so-version=./"; \
+ fi; \
+ done ;; esac; done > $@T; exit 0
mv -f $@T $@
# Get $(version) defined with the release version number.