Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: pylib/gyp/generator/make.py

Issue 1177163002: Fix gyp->make translation of rules with several outputs. (Closed) Base URL: https://chromium.googlesource.com/external/gyp@master
Patch Set: Test case added. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/actions-multiple-outputs-with-dependencies/gyptest-action.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/generator/make.py
diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py
index 16462be79d0674fe2178c6c3c8d0729c79262ab3..5cf2fe76be2841b218fe6cd5ef10d347a1531b4e 100644
--- a/pylib/gyp/generator/make.py
+++ b/pylib/gyp/generator/make.py
@@ -1741,15 +1741,15 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
# - Make .INTERMEDIATE depend on the intermediate.
# - The intermediate file depends on the inputs and executes the
# actual command.
- #
- # For an explanation of the problem and several solutions that don't
- # work, see this:
- # http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html
+ # - The intermediate recipe will 'touch' the intermediate file.
+ # - The multi-output rule will have an do-nothing recipe.
intermediate = "%s.intermediate" % (command if command else self.target)
self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
+ self.WriteLn('\t%s' % '@:');
self.WriteLn('%s: %s' % ('.INTERMEDIATE', intermediate))
self.WriteLn('%s: %s%s' %
(intermediate, ' '.join(inputs), force_append))
+ actions.insert(0, '$(call do_cmd,touch)')
if actions:
for action in actions:
« no previous file with comments | « no previous file | test/actions-multiple-outputs-with-dependencies/gyptest-action.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698