diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 16:43:46 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 16:43:46 +0000 |
| commit | 5d451ad21fc1836a024cabecc1172c32fbe92b03 (patch) | |
| tree | 0fd0ecdbfa8155d969d4bf07de86cfb576797ed3 /build | |
| parent | 1fdec6057b86baa458779e2a50da53f60631eaee (diff) | |
| download | chromium_src-5d451ad21fc1836a024cabecc1172c32fbe92b03.zip chromium_src-5d451ad21fc1836a024cabecc1172c32fbe92b03.tar.gz chromium_src-5d451ad21fc1836a024cabecc1172c32fbe92b03.tar.bz2 | |
clang: Make it possible to run Elliot's plugin on the bots
To make it possible to change the exact plugin command line without a master restart, the command line is loaded from a bash script. This script is used if clang_use_chrome_plugins and clang are both set in GYP_DEFINES when runhooks runs.
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=74597
Review URL: http://codereview.chromium.org/6461026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 73a57d9..980a806 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -126,6 +126,12 @@ # Remoting compilation is enabled by default. Set to 0 to disable. 'remoting%': 1, + # If this is set, the clang plugins used on the buildbot will be used. + # Run tools/clang/scripts/update.sh to make sure they are compiled. + # This causes 'clang_chrome_plugins_flags' to be set. + # Has no effect if 'clang' is not set as well. + 'clang_use_chrome_plugins%': 0, + 'conditions': [ # A flag to enable or disable our compile-time dependency # on gnome-keyring. If that dependency is disabled, no gnome-keyring @@ -182,6 +188,7 @@ 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 'use_third_party_translations%': '<(use_third_party_translations)', 'remoting%': '<(remoting)', + 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. @@ -488,6 +495,11 @@ 'grit_defines': ['-D', 'use_third_party_translations'], 'locales': ['ast', 'eu', 'gl', 'ka', 'ku', 'ug'], }], + + ['clang_use_chrome_plugins==1', { + 'clang_chrome_plugins_flags': + '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)', + }], ], }, 'target_defaults': { @@ -1210,6 +1222,14 @@ ], }]], }], + ['clang==1 and clang_use_chrome_plugins==1', { + 'target_conditions': [ + ['_toolset=="target"', { + 'cflags': [ + '<(clang_chrome_plugins_flags)', + ], + }]], + }], ['clang==1 and clang_load!="" and clang_add_plugin!=""', { 'target_conditions': [ ['_toolset=="target"', { @@ -1333,6 +1353,11 @@ '-Wno-overloaded-virtual', ], }], + ['clang==1 and clang_use_chrome_plugins==1', { + 'OTHER_CFLAGS': [ + '<(clang_chrome_plugins_flags)', + ], + }], ['clang==1 and clang_load!="" and clang_add_plugin!=""', { 'OTHER_CFLAGS': [ '-Xclang', '-load', '-Xclang', '<(clang_load)', |