aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-07-21 23:14:37 +0000
committerRoland McGrath <roland@gnu.org>2004-07-21 23:14:37 +0000
commit58c2859f14926dd965499eecdd4b9a41e0a1871b (patch)
tree449931f450aa489f486ffa92231898716fcf9e9f
parent2ed2dc184687ed609f7223bb5e9b30712742e876 (diff)
downloadglibc-58c2859f14926dd965499eecdd4b9a41e0a1871b.tar
glibc-58c2859f14926dd965499eecdd4b9a41e0a1871b.tar.gz
glibc-58c2859f14926dd965499eecdd4b9a41e0a1871b.tar.bz2
glibc-58c2859f14926dd965499eecdd4b9a41e0a1871b.zip
2004-07-21 Roland McGrath <roland@redhat.com>
* Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).
-rw-r--r--linuxthreads/Makefile3
-rw-r--r--nptl/Makefile1
2 files changed, 3 insertions, 1 deletions
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index 2d8a254c40..d416aa5d38 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -86,6 +86,7 @@ ifeq ($(build-shared),yes)
# We do it once and save the result in a generated makefile.
-include $(objpfx)multidir.mk
$(objpfx)multidir.mk: $(common-objpfx)config.make
+ $(make-target-directory)
dir=`$(CC) $(CFLAGS) $(CPPFLAGS) -print-multi-directory`; \
echo "multidir := $$dir" > $@T
mv -f $@T $@
@@ -308,7 +309,7 @@ $(objpfx)$(multidir)/crtn.o: $(objpfx)crtn.o $(objpfx)$(multidir)
ln -f $< $@
endif
-generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a
+generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a
endif
ifeq (yes,$(build-static-nss))
diff --git a/nptl/Makefile b/nptl/Makefile
index a723e8b884..e797f4d486 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -307,6 +307,7 @@ ifeq ($(build-shared),yes)
# We do it once and save the result in a generated makefile.
-include $(objpfx)multidir.mk
$(objpfx)multidir.mk: $(common-objpfx)config.make
+ $(make-target-directory)
dir=`$(CC) $(CFLAGS) $(CPPFLAGS) -print-multi-directory`; \
echo "multidir := $$dir" > $@T
mv -f $@T $@