diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | build/gyp_chromium | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -37,7 +37,7 @@ deps = { "http://protobuf.googlecode.com/svn/trunk@305", "src/tools/gyp": - "http://gyp.googlecode.com/svn/trunk@781", + "http://gyp.googlecode.com/svn/trunk@785", "src/v8": "http://v8.googlecode.com/svn/trunk@3836", diff --git a/build/gyp_chromium b/build/gyp_chromium index c212e8c..c955e39 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -72,6 +72,16 @@ if __name__ == '__main__': args.extend(['-I' + i for i in additional_include_files(args)]) + # There shouldn't be a circular dependency relationship between .gyp files, + # but in Chromium's .gyp files, on non-Mac platforms, circular relationships + # currently exist. The check for circular dependencies is currently + # bypassed on other platforms, but is left enabled on the Mac, where a + # violation of the rule causes Xcode to misbehave badly. + # TODO(mark): Find and kill remaining circular dependencies, and remove this + # option. http://crbug.com/35878. + if sys.platform != 'darwin': + args.append('--no-circular-check') + print 'Updating projects from gyp files...' sys.stdout.flush() |