Skip to content

Commit

Permalink
Bug 1668328 - Enclose Python paths in coreconf/config.gypi in quote…
Browse files Browse the repository at this point in the history
…s 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

--HG--
branch : NSS_3_57_BRANCH
extra : transplant_source : %C7%D3%B2%14%DDA%99%FCz%B6%04%0A%9E%7E%F1AI%CA%21Q
  • Loading branch information
Ricky Stewart committed Oct 5, 2020
1 parent d3a4878 commit d8a1abc
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions coreconf/config.gypi
Expand Up @@ -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)',
Expand Down Expand Up @@ -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',
}],
Expand Down Expand Up @@ -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)',
],
},
}],
Expand Down

0 comments on commit d8a1abc

Please sign in to comment.