From 04271a5e9394e6dadf6c5172bcfac1d5f086db8f Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 11 Apr 2012 18:26:52 -0700 Subject: [PATCH] gyp: Apply 'argument too long' fix in another place For some reason, aa5961a445acbd2b533ef870eb19733be7b7ede5 caused 'make test' to rebuild the entire project every time. Applying the fix to the other place where gyp chops up the argument list makes it behave properly. --- tools/gyp/pylib/gyp/generator/make.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index 3b01a8d8611..ec05190814f 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -2128,10 +2128,10 @@ def GenerateOutput(target_list, target_dicts, data, params): if generator_flags.get('auto_regeneration', True): WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files) - # Write the rule to load dependencies. We batch 1000 files at a time to + # Write the rule to load dependencies. We batch 512 files at a time to # avoid overflowing the command line. all_deps = "" - for i in range(1001, num_outputs, 1000): + for i in range(513, num_outputs, 512): all_deps += (""" ifneq ($(word %(start)d,$(d_files)),) $(shell cat $(wordlist %(start)d,%(end)d,$(d_files)) >> $(depsdir)/all.deps) @@ -2142,7 +2142,7 @@ def GenerateOutput(target_list, target_dicts, data, params): ifneq ($(word %(last)d,$(d_files)),) $(error Found unprocessed dependency files (gyp didn't generate enough rules!)) endif -""" % { 'last': ((num_outputs / 1000) + 1) * 1000 + 1 } +""" % { 'last': ((num_outputs / 512) + 1) * 512 + 1 } root_makefile.write(SHARED_FOOTER % { 'generate_all_deps': all_deps })