diff options
| author | scottmg@chromium.org <scottmg@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-11 23:52:16 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-11 23:52:16 +0000 |
| commit | e97dbe88f23bd8bcbd83478f0a2e7d6e6f17e351 (patch) | |
| tree | 89c219055408c3545a9fb2a2eaa6b2bc273068a1 | |
| parent | 0c9a7aa9446f9a51985c481fd4775245a6263cf2 (diff) | |
| download | gyp-e97dbe88f23bd8bcbd83478f0a2e7d6e6f17e351.tar.gz | |
ninja win: Remove obsolete comment, and make sure cc/cxx are always overridden
Builds on discussion in https://codereview.chromium.org/321813002/.
Make sure that cc_host and cxx_host are also set to a valid compiler,
which fixes the cflags test.
R=yukawa@chromium.org
BUG=chromium:233985
Review URL: https://codereview.chromium.org/324383004
git-svn-id: http://gyp.googlecode.com/svn/trunk@1933 78cadc50-ecff-11dd-a971-7dbc132099af
| -rw-r--r-- | pylib/gyp/generator/ninja.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py index b2785ed2..dd811e30 100644 --- a/pylib/gyp/generator/ninja.py +++ b/pylib/gyp/generator/ninja.py @@ -393,6 +393,8 @@ class NinjaWriter: self.ninja.variable('arch', self.win_env[arch]) self.ninja.variable('cc', '$cl_' + arch) self.ninja.variable('cxx', '$cl_' + arch) + self.ninja.variable('cc_host', '$cl_' + arch) + self.ninja.variable('cxx_host', '$cl_' + arch) if self.flavor == 'mac': self.archs = self.xcode_settings.GetActiveArchs(config_name) @@ -1715,11 +1717,10 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, # 'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set # to cc/cxx. if flavor == 'win': - # Overridden by local arch choice in the use_deps case. - # Chromium's ffmpeg c99conv.py currently looks for a 'cc =' line in - # build.ninja so needs something valid here. http://crbug.com/233985 - cc = 'cl.exe' - cxx = 'cl.exe' + # cc and cxx must be set to the correct architecture by overriding with one + # of cl_x86 or cl_x64 below. + cc = 'UNSET' + cxx = 'UNSET' ld = 'link.exe' ld_host = '$ld' else: |