From b3512d775a0cc7a929a47bd28fa83d9075a5e401 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 23 Feb 2017 22:01:18 +0000
Subject: [PATCH] Bug 1316879 - Don't use CPP/CXXCPP from environment after bug
 1299919. r=glandium

MozReview-Commit-ID: 4Of9nsVWK3q

--HG--
extra : rebase_source : 27724098df74dcff33ff5a8113200355ae287ae6
---
 build/buildconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/buildconfig.py b/build/buildconfig.py
index bb12114b2f4a..e73903a1a981 100644
--- a/build/buildconfig.py
+++ b/build/buildconfig.py
@@ -16,5 +16,5 @@ for var in ('topsrcdir', 'topobjdir', 'defines', 'non_global_defines',
 substs = dict(substs)
 
 for var in os.environ:
-    if var != 'SHELL' and var in substs:
+    if var not in ('CPP', 'CXXCPP', 'SHELL') and var in substs:
         substs[var] = os.environ[var]