From d8a1abc166e372df18533af6aebd3dfb1bacb672 Mon Sep 17 00:00:00 2001
From: Ricky Stewart <rstewart@mozilla.com>
Date: Mon, 5 Oct 2020 15:15:02 +0000
Subject: [PATCH] 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

--HG--
branch : NSS_3_57_BRANCH
extra : transplant_source : %C7%D3%B2%14%DDA%99%FCz%B6%04%0A%9E%7E%F1AI%CA%21Q
---
 coreconf/config.gypi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index 696a204ad2..8cae4c48d8 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)',
               ],
             },
           }],