boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-13 12:22:17 +00:00
Code Issues Projects Releases Wiki Activity

Reverting revision [79571] since it broke the generators_test.py Boost Build test. It seems Boost Jam might not have the complete fix implemented to allow us to avoid this Boost Build code.

Browse Source 
[SVN r79573]
This commit is contained in:
Jurko Gospodnetić
2012-07-17 09:29:02 +00:00
parent ef8a393163
commit ddbdcd0c04
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/build/virtual-target.jam
View File

@@ -761,6 +761,19 @@ class action
DEPENDS $(actual-targets) : $(self.actual-sources)
$(self.dependency-only-sources) ;
# This works around a bug with -j and actions that produce multiple
# target, where:
# - dependency on the first output is found, and the action is
# started
# - dependency on the second output is found, and bjam noticed that
# command is already running
# - instead of waiting for the command, dependents of the second
# targets are immediately updated.
if $(actual-targets[2])
{
INCLUDES $(actual-targets) : $(actual-targets) ;
}
# Action name can include additional argument to rule, which should
# not be passed to 'set-target-variables'
toolset.set-target-variables

11
src/build/virtual_target.py
View File

@@ -797,6 +797,17 @@ class Action:
self.engine_.add_dependency (actual_targets, self.actual_sources_ + self.dependency_only_sources_)
# This works around a bug with -j and actions that
# produce multiple target, where:
# - dependency on the first output is found, and
# the action is started
# - dependency on the second output is found, and
# bjam noticed that command is already running
# - instead of waiting for the command, dependents
# of the second targets are immediately updated.
if len(actual_targets) > 1:
bjam.call("INCLUDES", actual_targets, actual_targets)
# FIXME: check the comment below. Was self.action_name_ [1]
# Action name can include additional argument to rule, which should not
# be passed to 'set-target-variables'