Create a build_config header file.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
     # code, as opposed to external code.  This variable is used to control
     # such things as the set of warnings to enable, and whether warnings are
     # treated as errors.
@@ skipping 279 matching lines @@
         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
         'variables': {
           'werror%': '-Werror',
         },
         'cflags': [
           '<(werror)',  # See note above about the werror variable.
           '-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"', {
             'cflags': ['-fPIC'],
           }],
           ['OS=="android"', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'defines': ['NACL_ANDROID=1'],
               }, {
@@ skipping 132 matching lines @@
         ],
         'cflags_cc': [
           '-fno-rtti',
           '-fno-threadsafe-statics',
         ],
         'ldflags': [
           '-pthread',
           '-Wl,-z,noexecstack',
         ],
         'defines': [
-          'NACL_LINUX=1',
-          'NACL_OSX=0',
-          'NACL_WINDOWS=0',
           '_DEFAULT_SOURCE=1',
           '_BSD_SOURCE=1',
           '_POSIX_C_SOURCE=199506',
           '_XOPEN_SOURCE=600',
           '_GNU_SOURCE=1',
           '__STDC_LIMIT_MACROS=1',
         ],
         'configurations': {
           'Debug': {
             'variables': {
@@ skipping 61 matching lines @@
           'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
           'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
           'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',    # -Werror
           # Don't set GCC_VERSION so that we default to /usr/bin/gcc
           #'GCC_VERSION': '4.2',
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
           'PREBINDING': 'NO',                       # No -Wl,-prebind
           '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'}],
             ['clang==1', {
               'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
               'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
               'WARNING_CFLAGS': [
                 '-Wheader-hygiene',
                 # Don't die on dtoa code that uses a char as an array index.
@@ skipping 90 matching lines @@
                         'postbuild_name': 'Strip If Needed',
                         'action': ['<(strip_from_xcode_path)'],
                       },
                     ],
                   }],
                 ],
               }],
             ],
           }],
         ],
-        'defines': [
-          'NACL_LINUX=0',
-          'NACL_ANDROID=0',
-          'NACL_OSX=1',
-          'NACL_WINDOWS=0',
-        ],
       },
     }],
     ['OS=="win"', {
       'target_defaults': {
         'variables': {
           'windows_asm_rule%': 1,
         },
         'target_conditions': [
           ['windows_asm_rule==1', {
             'rules': [
@@ skipping 34 matching lines @@
           'NOMINMAX',
           '_CRT_RAND_S',
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           # WIN32_LEAN_AND_MEAN tells windows.h to omit obsolete and rarely
           # used #include files. This allows use of Winsock 2.0 which otherwise
           # would conflict with Winsock 1.x included by windows.h.
           'WIN32_LEAN_AND_MEAN',
           '_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"', {
             'defines': [
               '_HAS_TR1=0',
             ],
           }],
         ],
         'msvs_cygwin_dirs': ['../third_party/cygwin'],
         # TODO(bsy) remove 4355 once cross-repo
         # NACL_ALLOW_THIS_IN_INITIALIZER_LIST changes go in.
         'msvs_disabled_warnings': [4355, 4396, 4503, 4800, 4819],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'MinimalRebuild': 'false',
             'BufferSecurityCheck': 'true',
             'EnableFunctionLevelLinking': 'true',
             'RuntimeTypeInfo': 'false',
             'WarningLevel': '3',
             'WarnAsError': 'true',
             'DebugInformationFormat': '3',
             'ExceptionHandling': '0',
+            'AdditionalOptions': [
+              '/FI', 'native_client/src/include/build_config.h'
+            ],
           },
           'VCLibrarianTool': {
             'AdditionalOptions': ['/ignore:4221'],
           },
           'VCLinkerTool': {
             'AdditionalOptions': [
               '/safeseh:NO',
               '/dynamicbase:NO',
               '/ignore:4199',
               '/ignore:4221',
@@ skipping 91 matching lines @@
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
   'includes': [
     'untrusted.gypi',
   ],
 }