Bug 1666567 - land NSS c7d3b214dd41 UPGRADE_NSS_RELEASE, r=kjacobs

2020-10-05  Ricky Stewart  <rstewart@mozilla.com>

	* coreconf/config.gypi:
	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.

	[c7d3b214dd41] [tip]

Differential Revision: https://phabricator.services.mozilla.com/D92516
This commit is contained in:
J.C. Jones 2020-10-06 01:25:28 +00:00
Родитель 61a63adff5
Коммит 0a5ff268ea
3 изменённых файлов: 6 добавлений и 7 удалений

Просмотреть файл

@ -1 +1 @@
8fdbec414ce2 c7d3b214dd41

Просмотреть файл

@ -12,7 +12,7 @@
# chromium uses pymod_do_main, but gyp doesn't set a sensible # chromium uses pymod_do_main, but gyp doesn't set a sensible
# Python sys.path (gyp_chromium does). # Python sys.path (gyp_chromium does).
'python%': '<(python)', 'python%': '<(python)',
'host_arch%': '<!(<(python) <(DEPTH)/coreconf/detect_host_arch.py)', 'host_arch%': '<!("<(python)" <(DEPTH)/coreconf/detect_host_arch.py)',
}, },
'python%': '<(python)', 'python%': '<(python)',
'host_arch%': '<(host_arch)', 'host_arch%': '<(host_arch)',
@ -66,12 +66,12 @@
], ],
}], }],
['"<(GENERATOR)"=="ninja"', { ['"<(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', 'cc_is_clang%': '0',
}], }],
['"<(GENERATOR)"=="ninja"', { ['"<(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', 'cc_is_gcc%': '0',
}], }],
@ -441,11 +441,11 @@
}], }],
[ 'disable_werror==0 and OS!="android" and OS!="win"', { [ 'disable_werror==0 and OS!="android" and OS!="win"', {
'cflags': [ 'cflags': [
'<!@(<(python) <(DEPTH)/coreconf/werror.py)', '<!@("<(python)" <(DEPTH)/coreconf/werror.py)',
], ],
'xcode_settings': { 'xcode_settings': {
'OTHER_CFLAGS': [ 'OTHER_CFLAGS': [
'<!@(<(python) <(DEPTH)/coreconf/werror.py)', '<!@("<(python)" <(DEPTH)/coreconf/werror.py)',
], ],
}, },
}], }],

Просмотреть файл

@ -10,4 +10,3 @@
*/ */
#error "Do not include this header file." #error "Do not include this header file."