From 49916ec40ac31e264d0e5cddf98a39cc40124f00 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 12 Apr 2003 00:00:30 +0000 Subject: 2003-04-11 Roland McGrath * Makefile ($(objpfx)multidir.mk): New target, generated makefile that sets variable `multidir'; include that. (generated): Add it. ($(objpfx)$(multidir)/crti.o): New target. [$(multidir) != .] (generated-dirs, extra-objs, omit-deps): Add it. --- nptl/Makefile | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'nptl') diff --git a/nptl/Makefile b/nptl/Makefile index 0877b2a..cd8ad98 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -327,7 +327,27 @@ $(objpfx)defs.h: $(objpfx)pt-initfini.s $(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ -generated += crti.S defs.h pt-initfini.s $(objpfx)tst-atfork2.mtrace \ +# Set the `multidir' variable by grabbing the variable from the compiler. +# We do it once and save the result in a generated makefile. +-include $(objpfx)multidir.mk +$(objpfx)multidir.mk: $(common-objpfx)config.make + dir=`$(CC) $(CFLAGS) $(CPPFLAGS) -print-multi-directory`; \ + echo "multidir := $$dir" > $@T + mv -f $@T $@ + +generated += crti.S defs.h pt-initfini.s multidir.mk + +extra-objs += crti.o +omit-deps += crti +ifneq (,$(filter-out .,$(multidir))) +generated-dirs := $(firstword $(subst /, , $(multidir))) +extra-objs += $(multidir)/crti.o +omit-deps += $(multidir)/crti +$(objpfx)$(multidir)/crti.o: $(objpfx)crti.o $(objpfx)$(multidir)/ + ln -f $< $@ +endif + +generated += $(objpfx)tst-atfork2.mtrace \ $(addsuffix .so,$(strip $(modules-names))) $(objpfx)version.d: $(objpfx)banner.h -- cgit v1.1