Create a build_config header file.

SConstruct

Index: SConstruct
diff --git a/SConstruct b/SConstruct
index 997fa2c4f0e454d5619908b8db4369566845c073..04ed8517d3e2b02348cd9655ea8939742229f8c3 100755
--- a/SConstruct
+++ b/SConstruct
@@ -2144,13 +2144,6 @@ that the given target requires that argument be given."""
 pre_base_env.AddMethod(GetAbsDirArg)
 
 
-pre_base_env.Append(
-    CPPDEFINES = [
-        ['NACL_BUILD_ARCH', '${BUILD_ARCHITECTURE}' ],
-        ['NACL_BUILD_SUBARCH', '${BUILD_SUBARCH}' ],
-        ],
-    )
-
 def MakeGTestEnv(env):
   # Create an environment to run unit tests using Gtest.
   gtest_env = env.Clone()
@@ -2452,10 +2445,6 @@ def MakeWindowsEnv(platform=None):
 
   windows_env.Append(
       CPPDEFINES = [
-          ['NACL_WINDOWS', '1'],
-          ['NACL_OSX', '0'],
-          ['NACL_LINUX', '0'],
-          ['NACL_ANDROID', '0'],
           ['_WIN32_WINNT', '0x0501'],
           ['__STDC_LIMIT_MACROS', '1'],
           ['NOMINMAX', '1'],
@@ -2469,7 +2458,12 @@ def MakeWindowsEnv(platform=None):
       LIBS = ['ws2_32', 'advapi32'],
       # TODO(bsy) remove 4355 once cross-repo
       # NACL_ALLOW_THIS_IN_INITIALIZER_LIST changes go in.
-      CCFLAGS = ['/EHsc', '/WX', '/wd4355', '/wd4800'],
+      CCFLAGS = ['/EHsc', '/WX', '/wd4355', '/wd4800',
+                 # build_config.h is injected as a header in all sources to
+                 # provide macro definitions for the operating system and
+                 # architecture. This is injected so it's never accidentally
+                 # omitted in source files.
+                 '/FI', '$SOURCE_ROOT/native_client/src/include/build_config.h']
   )
 
   # This linker option allows us to ensure our builds are compatible with
@@ -2525,6 +2519,10 @@ def MakeUnixLikeEnv(platform=None):
         '-fdiagnostics-show-option',
         '-fvisibility=hidden',
         '-fstack-protector',
+        # build_config.h is injected as a header in all sources to provide
+        # macro definitions for the operating system and architecture. This is
+        # injected so it's never accidentally omitted in source files.
+        '-include', '$SOURCE_ROOT/native_client/src/include/build_config.h',
         ] + werror_flags,
     # NOTE: pthread is only neeeded for libppNaClPlugin.so and on arm
     LIBS = ['pthread'],
@@ -2576,15 +2574,12 @@ def MakeMacEnv(platform=None):
       CCFLAGS=[subarch_flag, '-fPIC'],
       ASFLAGS=[subarch_flag],
       LINKFLAGS=[subarch_flag, '-fPIC'],
-      CPPDEFINES = [['NACL_WINDOWS', '0'],
-                    ['NACL_OSX', '1'],
-                    ['NACL_LINUX', '0'],
-                    ['NACL_ANDROID', '0'],
-                    # defining _DARWIN_C_SOURCE breaks 10.4
+      CPPDEFINES = [# defining _DARWIN_C_SOURCE breaks 10.4
                     #['_DARWIN_C_SOURCE', '1'],
                     #['__STDC_LIMIT_MACROS', '1']
                     ],
   )
+
   return mac_env
 
 (mac_debug_env, mac_optimized_env) = GenerateOptimizationLevels(MakeMacEnv())
@@ -2630,8 +2625,6 @@ def SetUpLinuxEnvArm(env):
 
 def SetUpAndroidEnv(env):
   env.FilterOut(CPPDEFINES=[['_LARGEFILE64_SOURCE', '1']])
-  env.FilterOut(CPPDEFINES=[['NACL_ANDROID', '0']])
-  env.Prepend(CPPDEFINES=[['NACL_ANDROID', '1']])

[Mark Seaborn, 2015/01/07 20:52:38]

Don't you need to "#define ANDROID" as a replacement, as you do in the Gyp file?

[teravest, 2015/01/08 17:17:13]

ANDROID is already defined, see "-DANDROID" in CCLFAGS at line 2719.

   android_ndk_root = os.path.join('${SOURCE_ROOT}', 'third_party',
                                   'android_tools', 'ndk')
   android_ndk_experimental_root = os.path.join('${SOURCE_ROOT}',
@@ -2802,11 +2795,7 @@ def MakeGenericLinuxEnv(platform=None):
 
   # Prepend so we can disable warnings via Append
   linux_env.Prepend(
-      CPPDEFINES = [['NACL_WINDOWS', '0'],
-                    ['NACL_OSX', '0'],
-                    ['NACL_LINUX', '1'],
-                    ['NACL_ANDROID', '0'],
-                    ['_DEFAULT_SOURCE', '1'],
+      CPPDEFINES = [['_DEFAULT_SOURCE', '1'],
                     ['_BSD_SOURCE', '1'],
                     ['_POSIX_C_SOURCE', '199506'],
                     ['_XOPEN_SOURCE', '600'],
@@ -3116,11 +3105,11 @@ nacl_env.Append(
         ['DYNAMIC_ANNOTATIONS_ENABLED', '1' ],
         ['DYNAMIC_ANNOTATIONS_PREFIX', 'NACL_' ],
 
-        ['NACL_WINDOWS', '0'],
-        ['NACL_OSX', '0'],
-        ['NACL_LINUX', '0'],
-        ['NACL_ANDROID', '0'],
+        ['NACL_BUILD_ARCH', '${BUILD_ARCHITECTURE}' ],

[Mark Seaborn, 2015/01/07 20:52:38]

Nit: remove space before ']'

[teravest, 2015/01/08 17:17:13]

Done.

+        ['NACL_BUILD_SUBARCH', '${BUILD_SUBARCH}' ],
         ],
+    CCFLAGS = [
+      '-include', '$SOURCE_ROOT/native_client/src/include/build_config.h' ],

[Mark Seaborn, 2015/01/07 20:52:38]

Nit: remove space before ']' and indent by 4 spaces rather than 2

[teravest, 2015/01/08 17:17:13]

Done.

     )
 
 def FixWindowsAssembler(env):
@@ -3483,8 +3472,6 @@ def RawSyscallObjects(env, sources):
   raw_syscall_env.Append(
     CPPDEFINES = [
       ['USE_RAW_SYSCALLS', '1'],
-      ['NACL_BUILD_ARCH', '${BUILD_ARCHITECTURE}' ],
-      ['NACL_BUILD_SUBARCH', '${BUILD_SUBARCH}' ],
       ],
   )
   objects = []