From 12981fd72b6128eae5850fcfeee9d3bb1630b521 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 1 Aug 2012 23:10:38 +0200 Subject: Revert "force depfile concat on deliver" This reverts commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c. This does not work, because there is no dependency between the *Object .d files and the *Objects, and so the concat-deps races with the compiler writing the dep files. Introducing such a dependency would of course be reverting 8b5a984d45005d3df1c89eae897d6e04612625d8 --- solenv/gbuild/Library.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv/gbuild/Library.mk') diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 5866b9b80ac6..157be8c4992f 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_defs,$(2),\ $(gb_Library_DEFS) \ ) $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1)) -$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \ +$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Library_get_target,$(1))).dir $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) -- cgit