diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 23:19:47 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 23:19:47 +0000 |
| commit | 5ae4f55e218226f8f0636c4f0beab867d3032036 (patch) | |
| tree | d55c7371625c846366990c847446c7eb94032d81 /build/common.gypi | |
| parent | 46351669c279764e1b070943366d7c0ea84a243a (diff) | |
| download | chromium_src-5ae4f55e218226f8f0636c4f0beab867d3032036.zip chromium_src-5ae4f55e218226f8f0636c4f0beab867d3032036.tar.gz chromium_src-5ae4f55e218226f8f0636c4f0beab867d3032036.tar.bz2 | |
Add INCLUDE_SERVER_PORT and INCLUDE_SERVER_ARGS for distcc pump.
Review URL: http://codereview.chromium.org/73008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 580d080..5058a31 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -56,15 +56,15 @@ 'xcode_settings': { 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', - }, + }, # Add -lgcov for executables, not for static_libraries. # This is a delayed conditional. 'target_conditions': [ ['_type=="executable"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '-lgcov' ] }, - }], - ], - }], + }], + ], + }], # TODO(jrg): complete this work once Linux transitions to gyp. # This is untested (--> likely doesn't work). ['OS=="linux"', { @@ -73,8 +73,8 @@ 'target_conditions': [ ['_type=="executable"', { 'link_settings': { 'libraries': [ '-lgcov' ] }, - }], - ], + }], + ], }], ]}, # TODO(jrg): options for code coverage on Windows @@ -219,6 +219,8 @@ 'DISTCC_DIR', 'DISTCC_HOSTS', 'HOME', + 'INCLUDE_SERVER_ARGS', + 'INCLUDE_SERVER_PORT', 'LINK', ], 'configurations': { |