Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Side by Side Diff: pylib/gyp/generator/ninja.py

Issue 10833021: Honor $CC/$CC_host and friends in make generator. (Closed) Base URL: http://git.chromium.org/external/gyp.git@master
Patch Set: ninja: don't run manifest tool when LD_target is overridden Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import gyp 6 import gyp
7 import gyp.common 7 import gyp.common
8 import gyp.msvs_emulation 8 import gyp.msvs_emulation
9 import gyp.MSVSVersion 9 import gyp.MSVSVersion
10 import gyp.system_test 10 import gyp.system_test
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1463 master_ninja.rule('solink', description=dlldesc, command=dllcmd, 1463 master_ninja.rule('solink', description=dlldesc, command=dllcmd,
1464 rspfile='$dll.rsp', 1464 rspfile='$dll.rsp',
1465 rspfile_content='$libs $in_newline $ldflags', 1465 rspfile_content='$libs $in_newline $ldflags',
1466 restat=True) 1466 restat=True)
1467 master_ninja.rule('solink_module', description=dlldesc, command=dllcmd, 1467 master_ninja.rule('solink_module', description=dlldesc, command=dllcmd,
1468 rspfile='$dll.rsp', 1468 rspfile='$dll.rsp',
1469 rspfile_content='$libs $in_newline $ldflags', 1469 rspfile_content='$libs $in_newline $ldflags',
1470 restat=True) 1470 restat=True)
1471 # Note that ldflags goes at the end so that it has the option of 1471 # Note that ldflags goes at the end so that it has the option of
1472 # overriding default settings earlier in the command line. 1472 # overriding default settings earlier in the command line.
1473 command=('%s gyp-win-tool link-wrapper $arch '
bradn 2012/07/31 17:19:23 style guide requires spaces around =
1474 '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp' %
1475 sys.executable)
1476 if not os.environ.get('LD_target'):
1477 command+=(' && %s gyp-win-tool manifest-wrapper $arch '
bradn 2012/07/31 17:19:23 style guide requires spaces around +=
1478 '$mt -nologo -manifest $manifests -out:$out.manifest' %
1479 sys.executable)
1473 master_ninja.rule( 1480 master_ninja.rule(
1474 'link', 1481 'link',
1475 description='LINK $out', 1482 description='LINK $out',
1476 command=('%s gyp-win-tool link-wrapper $arch ' 1483 command=command,
1477 '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp && '
1478 '%s gyp-win-tool manifest-wrapper $arch '
1479 '$mt -nologo -manifest $manifests -out:$out.manifest' %
1480 (sys.executable, sys.executable)),
1481 rspfile='$out.rsp', 1484 rspfile='$out.rsp',
1482 rspfile_content='$in_newline $libs $ldflags') 1485 rspfile_content='$in_newline $libs $ldflags')
1483 else: 1486 else:
1484 master_ninja.rule( 1487 master_ninja.rule(
1485 'objc', 1488 'objc',
1486 description='OBJC $out', 1489 description='OBJC $out',
1487 command=('$cc -MMD -MF $out.d $defines $includes $cflags $cflags_objc ' 1490 command=('$cc -MMD -MF $out.d $defines $includes $cflags $cflags_objc '
1488 '$cflags_pch_objc -c $in -o $out'), 1491 '$cflags_pch_objc -c $in -o $out'),
1489 depfile='$out.d') 1492 depfile='$out.d')
1490 master_ninja.rule( 1493 master_ninja.rule(
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 1647
1645 user_config = params.get('generator_flags', {}).get('config', None) 1648 user_config = params.get('generator_flags', {}).get('config', None)
1646 if user_config: 1649 if user_config:
1647 GenerateOutputForConfig(target_list, target_dicts, data, params, 1650 GenerateOutputForConfig(target_list, target_dicts, data, params,
1648 user_config) 1651 user_config)
1649 else: 1652 else:
1650 config_names = target_dicts[target_list[0]]['configurations'].keys() 1653 config_names = target_dicts[target_list[0]]['configurations'].keys()
1651 for config_name in config_names: 1654 for config_name in config_names:
1652 GenerateOutputForConfig(target_list, target_dicts, data, params, 1655 GenerateOutputForConfig(target_list, target_dicts, data, params,
1653 config_name) 1656 config_name)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698