diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-08-01 18:19:28 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-08-01 18:25:23 +0200 |
| commit | b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c (patch) | |
| tree | 9c8e2feeeb7770918b3c7e06f7a6a0d1100b3c12 /solenv | |
| parent | 7917af89eb4901c9ed77c7847bc0e8588685fd83 (diff) | |
force depfile concat on deliver
* in some scenarios gcc (or ccache) generate relative paths
* thus we need to concat the depfiles in the same makerun as the compiles
* stiil not foolproof:
- cd sw && make and abort with Ctrl-C
- cd .. && make sw
- now we have deps from mixed workdirs
* in the end we should likely always cd to SRCDIR before all compiles
Change-Id: I007da96f38ed2cfe403b692400f447764f6d6988
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 9f562961f4cd..f1d392a6747d 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_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_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 157be8c4992f..5866b9b80ac6 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_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_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))) |