summaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-02-28 13:00:27 -0800
committerRoland McGrath <roland@hack.frob.com>2014-02-28 13:00:27 -0800
commitf08e9a26299db1972cb29a7e84b40b0cc9866bf2 (patch)
treecf58294441fc8481ce67696b075a6ff8378cbcea /nptl
parentff71cc373be1cc2875f8ea0b8d4f5232f1a5d673 (diff)
Fix fallout from Joseph's untested Makeconfig change.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/Makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a1d0f11d4b..c01177ed83 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-28 Roland McGrath <roland@hack.frob.com>
+
+ * Makefile (generated-dirs): Use += rather than =.
+
2014-02-26 Joseph Myers <joseph@codesourcery.com>
* Makefile: Include Makeconfig immediately after defining subdir.
diff --git a/nptl/Makefile b/nptl/Makefile
index d568e5d34d..320facf8ea 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -338,7 +338,7 @@ $(objpfx)multidir.mk: $(common-objpfx)config.make
crti-objs := crti.o
crtn-objs := crtn.o
ifneq (,$(patsubst .,,$(multidir)))
-generated-dirs := $(firstword $(subst /, , $(multidir)))
+generated-dirs += $(firstword $(subst /, , $(multidir)))
crti-objs += $(multidir)/crti.o
crtn-objs += $(multidir)/crtn.o
$(objpfx)$(multidir):