summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-16 20:14:26 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-16 20:14:26 +0000
commita7cfe899263d8d861e87ba1c70e3c307afdf3a39 (patch)
tree3d25f76b52f19fd6b4a991e82735a01036087e05 /build
parentddacbccfb30f24ba6daa3b60450daac8053a8797 (diff)
downloadchromium_src-a7cfe899263d8d861e87ba1c70e3c307afdf3a39.zip
chromium_src-a7cfe899263d8d861e87ba1c70e3c307afdf3a39.tar.gz
chromium_src-a7cfe899263d8d861e87ba1c70e3c307afdf3a39.tar.bz2
Circular relationships between .gyp files should be errors. Make them errors,
but currently only on the Mac. These relationships should be errors on all platforms, but some currently exist on non-Mac platforms. See http://crbug.com/35878. Because the Mac is the only platform where a circular dependency between .gyp files is known to cause tangible problems, the portions of Chromium's .gyp files that are used by Macs have been fixed to remove these relationships, and the check is left enabled on the Mac to ensure that no new ones are created. BUG=35308 TEST=none Review URL: http://codereview.chromium.org/600151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/gyp_chromium10
1 files changed, 10 insertions, 0 deletions
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()