summaryrefslogtreecommitdiffstats
path: root/build/gyp_chromium
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-24 00:35:46 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-24 00:35:46 +0000
commit5c14951ae6906a26ec9b141785ba48b8313cf7e9 (patch)
tree77a2653ea742cb99abca61c3502345ecec5fab4c /build/gyp_chromium
parentf4b8f31dde49067a092303025d4baaf47e93f491 (diff)
downloadchromium_src-5c14951ae6906a26ec9b141785ba48b8313cf7e9.zip
chromium_src-5c14951ae6906a26ec9b141785ba48b8313cf7e9.tar.gz
chromium_src-5c14951ae6906a26ec9b141785ba48b8313cf7e9.tar.bz2
Break gyp cycles on Linux.
The cycle is between installer.gyp and chrome.gyp. The fix is to switch installer.gyp into installer.gypi and include it into chrome.gyp BUG=35308 Review URL: http://codereview.chromium.org/2067018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
-rwxr-xr-xbuild/gyp_chromium2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 9c87e82..ab05ae9 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -79,7 +79,7 @@ if __name__ == '__main__':
# 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':
+ if sys.platform not in ('darwin', 'linux2'):
args.append('--no-circular-check')
# If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check