diff options
| author | Ricky Stewart <rstewart@mozilla.com> | 2020-10-05 15:15:02 +0000 |
|---|---|---|
| committer | Ricky Stewart <rstewart@mozilla.com> | 2020-10-05 15:15:02 +0000 |
| commit | a775e526d5b24fa118ffd2668983b66ca057fa76 (patch) | |
| tree | 9c1f98366787e22f55adfb01084b03c397cbd044 /coreconf | |
| parent | d5aec324bf14d8903b96cce17ae0f0147f27c238 (diff) | |
| download | nss-hg-a775e526d5b24fa118ffd2668983b66ca057fa76.tar.gz | |
Bug 1668328 - Enclose Python paths in `coreconf/config.gypi` in quotes r=kjacobs,mt
This fixes a breakage if the Python path happens to have a space in it.
Differential Revision: https://phabricator.services.mozilla.com/D92236
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/config.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 696a204ad..8cae4c48d 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -12,7 +12,7 @@ # chromium uses pymod_do_main, but gyp doesn't set a sensible # Python sys.path (gyp_chromium does). 'python%': '<(python)', - 'host_arch%': '<!(<(python) <(DEPTH)/coreconf/detect_host_arch.py)', + 'host_arch%': '<!("<(python)" <(DEPTH)/coreconf/detect_host_arch.py)', }, 'python%': '<(python)', 'host_arch%': '<(host_arch)', @@ -66,12 +66,12 @@ ], }], ['"<(GENERATOR)"=="ninja"', { - 'cc_is_clang%': '<!(<(python) <(DEPTH)/coreconf/check_cc.py clang)', + 'cc_is_clang%': '<!("<(python)" <(DEPTH)/coreconf/check_cc.py clang)', }, { 'cc_is_clang%': '0', }], ['"<(GENERATOR)"=="ninja"', { - 'cc_is_gcc%': '<!(<(python) <(DEPTH)/coreconf/check_cc.py gcc)', + 'cc_is_gcc%': '<!("<(python)" <(DEPTH)/coreconf/check_cc.py gcc)', }, { 'cc_is_gcc%': '0', }], @@ -441,11 +441,11 @@ }], [ 'disable_werror==0 and OS!="android" and OS!="win"', { 'cflags': [ - '<!@(<(python) <(DEPTH)/coreconf/werror.py)', + '<!@("<(python)" <(DEPTH)/coreconf/werror.py)', ], 'xcode_settings': { 'OTHER_CFLAGS': [ - '<!@(<(python) <(DEPTH)/coreconf/werror.py)', + '<!@("<(python)" <(DEPTH)/coreconf/werror.py)', ], }, }], |