Honor $CC/$CC_host and friends in make generator.

pylib/gyp/generator/make.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Notes:
 #
 # This is all roughly based on the Makefile system used by the Linux
 # kernel, but is a non-recursive make -- we put the entire dependency
 # graph in front of make and let it figure it out.
 #
@@ skipping 42 matching lines @@
 generator_wants_sorted_dependencies = False
 
 # Placates pylint.
 generator_additional_non_configuration_keys = []
 generator_additional_path_sections = []
 generator_extra_sources_for_rules = []
 
 
 def CalculateVariables(default_variables, params):
   """Calculate additional variables for use in the build (called by gyp)."""
-  cc_target = os.environ.get('CC.target', os.environ.get('CC', 'cc'))
   flavor = gyp.common.GetFlavor(params)
   if flavor == 'mac':
     default_variables.setdefault('OS', 'mac')
     default_variables.setdefault('SHARED_LIB_SUFFIX', '.dylib')
     default_variables.setdefault('SHARED_LIB_DIR',
                                  generator_default_variables['PRODUCT_DIR'])
     default_variables.setdefault('LIB_DIR',
                                  generator_default_variables['PRODUCT_DIR'])
 
     # Copy additional generator configuration data from Xcode, which is shared
@@ skipping 174 matching lines @@
 #
 # Note: flock is used to seralize linking. Linking is a memory-intensive
 # process so running parallel links can often lead to thrashing.  To disable
 # the serialization, override LINK via an envrionment variable as follows:
 #
 #   export LINK=g++
 #
 # This will allow make to invoke N linker processes as specified in -jN.
 LINK ?= %(flock)s $(builddir)/linker.lock $(CXX)
 
-CC.target ?= $(CC)
+CC.target ?= %(CC.target)s
 CFLAGS.target ?= $(CFLAGS)
-CXX.target ?= $(CXX)
+CXX.target ?= %(CXX.target)s
 CXXFLAGS.target ?= $(CXXFLAGS)
-LINK.target ?= $(LINK)
+LINK.target ?= %(LINK.target)s
 LDFLAGS.target ?= $(LDFLAGS)
 AR.target ?= $(AR)
 ARFLAGS.target ?= %(ARFLAGS.target)s
 
 # N.B.: the logic of which commands to run should match the computation done
 # in gyp's make.py where ARFLAGS.host etc. is computed.
 # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
 # to replicate this environment fallback in make as well.
 CC.host ?= gcc
 CFLAGS.host ?=
@@ skipping 1611 matching lines @@
   """Run tests against the system to compute default settings for commands.
 
   Returns:
     dictionary of settings matching the block of command-lines used in
     SHARED_HEADER.  E.g. the dictionary will contain a ARFLAGS.target
     key for the default ARFLAGS for the target ar command.
   """
   # Compute flags used for building static archives.
   # N.B.: this fallback logic should match the logic in SHARED_HEADER.
   # See comment there for more details.
-  ar_target = os.environ.get('AR.target', os.environ.get('AR', 'ar'))
-  cc_target = os.environ.get('CC.target', os.environ.get('CC', 'cc'))
+  ar_target = GetEnv('AR.target', 'AR_target', 'ar')
+  cc_target = GetEnv('CC.target', 'CC_target', 'cc')
   arflags_target = 'crs'
   # ar -T enables thin archives on Linux. OS X's ar supports a -T flag, but it
   # does something useless (it limits filenames in the archive to 15 chars).
   if flavor != 'mac' and gyp.system_test.TestArSupportsT(ar_command=ar_target,
                                                          cc_command=cc_target):
     arflags_target = 'crsT'
 
   ar_host = os.environ.get('AR.host', 'ar')
   cc_host = os.environ.get('CC.host', 'gcc')
   arflags_host = 'crs'
   # It feels redundant to compute this again given that most builds aren't
   # cross-compiles, but due to quirks of history CC.host defaults to 'gcc'
   # while CC.target defaults to 'cc', so the commands really are different
   # even though they're nearly guaranteed to run the same code underneath.
   if flavor != 'mac' and gyp.system_test.TestArSupportsT(ar_command=ar_host,
                                                          cc_command=cc_host):
     arflags_host = 'crsT'
 
   return { 'ARFLAGS.target': arflags_target,
            'ARFLAGS.host': arflags_host }
 
 
+def GetEnv(primary, secondary, default):
+  """Look up a key in the environment, falling back to a secondary key
+  and finally falling back to a default value."""
+  return os.environ.get(primary, os.environ.get(secondary, default))
+
 def GenerateOutput(target_list, target_dicts, data, params):
   options = params['options']
   flavor = gyp.common.GetFlavor(params)
   generator_flags = params.get('generator_flags', {})
   builddir_name = generator_flags.get('output_dir', 'out')
   android_ndk_version = generator_flags.get('android_ndk_version', None)
   default_target = generator_flags.get('default_target', 'all')
 
   def CalculateMakefilePath(build_file, base_name):
     """Determine where to write a Makefile for a given gyp file."""
@@ skipping 59 matching lines @@
   elif flavor == 'solaris':
     header_params.update({
         'flock': './gyp-sun-tool flock',
         'flock_index': 2,
         'extra_commands': SHARED_HEADER_SUN_COMMANDS,
     })
   elif flavor == 'freebsd':
     header_params.update({
         'flock': 'lockf',
     })
+
   header_params.update(RunSystemTests(flavor))
+  header_params.update({
+    'CC.target': GetEnv('CC.target', 'CC_target', '$(CC)'),
+    'AR.target': GetEnv('AR.target', 'AR_target', '$(AR)'),
+    'CXX.target': GetEnv('CXX.target', 'CXX_target', '$(CXX)'),
+    'LINK.target': GetEnv('LINK.target', 'LD_target', '$(LINK)'),
+  })
 
   build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0])
   make_global_settings_dict = data[build_file].get('make_global_settings', {})
   make_global_settings = ''
   for key, value in make_global_settings_dict:
     if value[0] != '$':
       value = '$(abspath %s)' % value
     if key == 'LINK':
       make_global_settings += ('%s ?= %s $(builddir)/linker.lock %s\n' %
                                (key, flock_command, value))
@@ skipping 115 matching lines @@
     root_makefile.write("  include " + include_file + "\n")
     root_makefile.write("endif\n")
   root_makefile.write('\n')
 
   if generator_flags.get('auto_regeneration', True):
     WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
 
   root_makefile.write(SHARED_FOOTER)
 
   root_makefile.close()