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

Unified Diff: build/common.gypi

Issue 788193003: Create a build_config header file. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: mac gypi2 Created 6 years 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 4c6289fa4ebc6331ec19a2675f2ec74cb9ff0e8d..a2e0cdc8469816356fb78ba3e57b74f6d2d193cc 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -297,6 +297,7 @@
'-pthread',
'-fno-exceptions',
'-Wall', # TODO(bradnelson): why does this disappear?!?
+ '-include', 'native_client/src/include/build_config.h'
],
'conditions': [
['nacl_standalone==1 and OS=="linux"', {
@@ -449,9 +450,6 @@
'-Wl,-z,noexecstack',
],
'defines': [
- 'NACL_LINUX=1',
- 'NACL_OSX=0',
- 'NACL_WINDOWS=0',
'_DEFAULT_SOURCE=1',
'_BSD_SOURCE=1',
'_POSIX_C_SOURCE=199506',
@@ -533,6 +531,9 @@
'USE_HEADERMAP': 'NO',
# TODO(bradnelson): -Werror ?!?
'WARNING_CFLAGS': ['-Wall', '-Wendif-labels', '-Wno-long-long'],
+ 'OTHER_CFLAGS': [
+ '-include', 'native_client/src/include/build_config.h'
Mark Seaborn 2014/12/29 17:51:04 Nit: indent by 2 spaces rather than 4
teravest 2014/12/29 22:29:28 Done.
+ ],
'conditions': [
['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
{'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}],
@@ -643,12 +644,6 @@
],
}],
],
- 'defines': [
- 'NACL_LINUX=0',
- 'NACL_ANDROID=0',
- 'NACL_OSX=1',
- 'NACL_WINDOWS=0',
- ],
},
}],
['OS=="win"', {
@@ -703,11 +698,6 @@
'_SECURE_ATL',
'__STDC_LIMIT_MACROS=1',
'_HAS_EXCEPTIONS=0',
-
- 'NACL_LINUX=0',
- 'NACL_ANDROID=0',
- 'NACL_OSX=0',
- 'NACL_WINDOWS=1'
],
'conditions': [
['MSVS_VERSION=="2008"', {
@@ -730,6 +720,9 @@
'WarnAsError': 'true',
'DebugInformationFormat': '3',
'ExceptionHandling': '0',
+ 'AdditionalOptions': [
+ '/FI', 'native_client/src/include/build_config.h'
+ ],
},
'VCLibrarianTool': {
'AdditionalOptions': ['/ignore:4221'],

Powered by Google App Engine
This is Rietveld 408576698