Use as/cc/ld flags in all situations

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """NaCl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 122 matching lines @@
 
   bin_path = os.path.join(sdk_path, 'bin')
   # NOTE: attempts to eliminate this PATH setting and use
   #       absolute path have been futile
   env.PrependENVPath('PATH', bin_path)
 
   tool_prefix = None
   tool_map = NACL_TOOL_MAP[env['TARGET_ARCHITECTURE']]
   subarch_spec = tool_map[env['TARGET_SUBARCH']]
   tooldir = subarch_spec['tooldir']
+  # We need to pass it extra options for the subarch we are building.
+  as_mode_flag = subarch_spec['as_flag']
+  cc_mode_flag = subarch_spec['cc_flag']
+  ld_mode_flag = subarch_spec['ld_flag']
   if os.path.exists(os.path.join(sdk_path, tooldir)):
     # The tooldir for the build target exists.
     # The tools there do the right thing without special options.
     tool_prefix = tooldir
     libdir = os.path.join(tooldir, 'lib')
-    as_mode_flag = ''
-    cc_mode_flag = ''
-    ld_mode_flag = ''
   else:
     # We're building for a target for which there is no matching tooldir.
     # For example, for x86-32 when only <sdk_path>/x86_64-nacl/ exists.
     # Find a tooldir for a different subarch that does exist.
     others_map = tool_map.copy()
     del others_map[env['TARGET_SUBARCH']]
     for subarch, tool_spec in others_map.iteritems():
       tooldir = tool_spec['tooldir']
       if os.path.exists(os.path.join(sdk_path, tooldir)):
         # OK, this is the other subarch to use as tooldir.
         tool_prefix = tooldir
-        # We need to pass it extra options for the subarch we are building.
-        as_mode_flag = subarch_spec['as_flag']
-        cc_mode_flag = subarch_spec['cc_flag']
-        ld_mode_flag = subarch_spec['ld_flag']
         # The lib directory may have an alternate name, i.e.
         # 'lib32' in the x86_64-nacl tooldir.
         libdir = os.path.join(tooldir, subarch_spec.get('other_libdir', 'lib'))
         break
 
   if tool_prefix is None:
     raise Exception("Cannot find a toolchain for %s in %s" %
                     (env['TARGET_FULLARCH'], sdk_path))
 
   env.Replace(# Replace header and lib paths.
@@ skipping 145 matching lines @@
 
   if env.Bit('x86_64_zero_based_sandbox'):
     pnacl_translate_flags += ' -sfi-zero-based-sandbox'
 
   if pnacl_extra_lib:
     env.Prepend(LIBPATH=pnacl_extra_lib)
 
   env.Replace(# Replace header and lib paths.
               NACL_SDK_INCLUDE=pnacl_include,
               NACL_SDK_LIB=pnacl_lib,
+              # Remove arch-specific flags (if any)
+              BASE_LINKFLAGS='',
+              BASE_CFLAGS='',
+              BASE_CXXFLAGS='',
+              BASE_ASFLAGS='',
+              BASE_ASPPFLAGS='',
               # Replace the normal unix tools with the PNaCl ones.
               CC=pnacl_cc + pnacl_cc_flags,
               CXX=pnacl_cxx + pnacl_cxx_flags,
               ASPP=pnacl_cc + pnacl_cc_flags,
               LIBPREFIX="lib",
               SHLIBPREFIX="lib",
               SHLIBSUFFIX=".so",
               OBJSUFFIX=".bc",
               LINK=pnacl_cxx + ld_arch_flag + pnacl_ld_flags,
               # Although we are currently forced to produce native output
@@ skipping 447 matching lines @@
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
       skeys=['.a', '.so', '.pso'],
       path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
       recursive=True
       )
   env.Append(SCANNERS=ldscript_scanner)