diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-01 23:10:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-01 23:10:38 +0200 |
| commit | 12981fd72b6128eae5850fcfeee9d3bb1630b521 (patch) | |
| tree | cd43c28fcb0751a2466d96c61f8cfd9fc70a7922 /solenv | |
| parent | 79e1b9cb2305bc00665e94afd6a00e9f18b76bf8 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index f1d392a6747d..9f562961f4cd 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -55,7 +55,7 @@ define gb_Executable__Executable_impl $(call gb_Executable_set_targettype_gui,$(2)) $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Executable) -$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \ +$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Executable_get_target,$(1))).dir $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Executable_Executable_platform,$(1),$(2)) 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))) |