diff options
| author | yukawa@chromium.org <yukawa@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-16 16:12:51 +0000 |
|---|---|---|
| committer | yukawa@chromium.org <yukawa@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-16 16:12:51 +0000 |
| commit | 4d45bd7473c86e67f2317ce7dd92c3c9388e2048 (patch) | |
| tree | 22cf0cd6d470931bdf4a6993224bfcb3b93844ca | |
| parent | e35391e5b016a4fe65f30c93278862c8ac2ea927 (diff) | |
| download | gyp-4d45bd7473c86e67f2317ce7dd92c3c9388e2048.tar.gz | |
Teach Ninja generator about 'LD'/'LD.host' specified in 'make_global_settings_ld'.
With this CL, Ninja generator starts recognizing 'LD'/'LD.host' specified in 'make_global_settings', like Make generator. This makes it easier for you to share the code among host/NaCl/NDK/Emscripten build targets.
BUG=gyp:434
TEST=unittest
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/335443007
git-svn-id: http://gyp.googlecode.com/svn/trunk@1941 78cadc50-ecff-11dd-a971-7dbc132099af
| -rw-r--r-- | pylib/gyp/generator/ninja.py | 4 | ||||
| -rw-r--r-- | test/make_global_settings/ld/gyptest-make_global_settings_ld.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py index 43e5ebd4..145fe040 100644 --- a/pylib/gyp/generator/ninja.py +++ b/pylib/gyp/generator/ninja.py @@ -1759,6 +1759,10 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, if key == 'CXX.host': cxx_host = os.path.join(build_to_root, value) cxx_host_global_setting = value + if key == 'LD': + ld = os.path.join(build_to_root, value) + if key == 'LD.host': + ld_host = os.path.join(build_to_root, value) if key.endswith('_wrapper'): wrappers[key[:-len('_wrapper')]] = os.path.join(build_to_root, value) diff --git a/test/make_global_settings/ld/gyptest-make_global_settings_ld.py b/test/make_global_settings/ld/gyptest-make_global_settings_ld.py index fdea8a81..c0b0a38d 100644 --- a/test/make_global_settings/ld/gyptest-make_global_settings_ld.py +++ b/test/make_global_settings/ld/gyptest-make_global_settings_ld.py @@ -96,9 +96,7 @@ verify_ld_host(test) # Test 'LD' in 'make_global_settings'. with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): test.run_gyp('make_global_settings_ld.gyp', '-Dcustom_ld_target=my_ld') -# TODO(yukawa): Support 'LD' in Ninja generator -if test.format == 'make': - verify_ld_target(test, ld='my_ld', rel_path=True) +verify_ld_target(test, ld='my_ld', rel_path=True) # Test 'LD'/'LD.host' in 'make_global_settings'. @@ -106,10 +104,8 @@ with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): test.run_gyp('make_global_settings_ld.gyp', '-Dcustom_ld_target=my_ld_target1', '-Dcustom_ld_host=my_ld_host1') -# TODO(yukawa): Support 'LD'/'LD.host' in Ninja generator -if test.format == 'make': - verify_ld_target(test, ld='my_ld_target1', rel_path=True) - verify_ld_host(test, ld='my_ld_host1', rel_path=True) +verify_ld_target(test, ld='my_ld_target1', rel_path=True) +verify_ld_host(test, ld='my_ld_host1', rel_path=True) # Unlike other environment variables such as $AR/$AR_host, $CC/$CC_host, |