Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3452)

Unified Diff: build/common.gypi

Issue 67092: Matching v8 build settings more closely to try to fix regression in performan... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/temp_gyp/v8.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 13611)
+++ build/common.gypi (working copy)
@@ -39,6 +39,12 @@
# {'variables': {'library': 'shared_library'}}
# to compile as shared by default
'library%': 'static_library',
+
+ # TODO(bradnelson): eliminate this when possible.
+ # To allow local gyp files to prevent release.vsprops from being included.
+ # Yes(1) means include release.vsprops.
+ # Once all vsprops settings are migrated into gyp, this can go away.
+ 'msvs_use_common_release%': 1,
},
'target_defaults': {
'conditions': [
@@ -56,15 +62,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 +79,8 @@
'target_conditions': [
['_type=="executable"', {
'link_settings': { 'libraries': [ '-lgcov' ] },
- }],
- ],
+ }],
+ ],
}],
]},
# TODO(jrg): options for code coverage on Windows
@@ -124,7 +130,7 @@
'DEAD_CODE_STRIPPING': 'YES',
}
}],
- [ 'OS=="win"', {
+ [ 'OS=="win" and msvs_use_common_release', {
'configuration_platform': 'Win32',
'msvs_props': ['release.vsprops'],
}],
« no previous file with comments | « no previous file | build/temp_gyp/v8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698