summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi14
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': {