From 5334740f6224bae039996e78cae025bc18c488b3 Mon Sep 17 00:00:00 2001 From: "Michael I. Bushnell" Date: Tue, 16 Aug 1994 18:12:16 +0000 Subject: Formerly Makeconf.~56~ --- Makeconf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makeconf') diff --git a/Makeconf b/Makeconf index 8ecd6d87..e7d0a023 100644 --- a/Makeconf +++ b/Makeconf @@ -158,11 +158,13 @@ HURDLIBS-files := $(foreach var,$(HURDLIBS),$($(var))) ifeq ($(doinst),one) $(target): $(OBJS) $(HURDLIBS-files) $(OTHERLIBS) $(libc) $(CC) $(CFLAGS) $(LDFLAGS) -o $(target) $(link-objects) -#link-objects = $(filter-out $(libc),$^) +# Don't use $^ to collect the args to the link because $^ gratuitously +# omits duplicates. +link-objects = $(OBJS) $(HURDLIBS-files) $(OTHERLIBS) # -lg avoids "No input files" error. -link-objects = -nostdlib -Wl,$(subst $(empty) ,$(comma),\ - $(startup) -\( $(filter-out $(libc),$^) -\) \ - -\( $(sort $(libc)) -lgcc -\)) -lg -v +#link-objects = -nostdlib -Wl,$(subst $(empty) ,$(comma),\ +# $(startup) -\( $(OBJS) $(HURDLIBS-filess) $(OTHERLIBS) -\) \ +# -\( $(sort $(libc)) -lgcc -\)) -lg -v empty = comma = , endif -- cgit v1.2.3