Bug 1316879 - Don't use CPP/CXXCPP from environment after bug 1299919. r=glandium, a=lizzard
authorJan Beich <jbeich@FreeBSD.org>
Thu, 23 Feb 2017 22:01:18 +0000
changeset 359637 e9f2075a8de61086e6ba7207fdaf1f81b578f4ff
parent 359636 c92f80e12f0c6fb8837b6707e75edf4731457b02
child 359638 6139d75fe055e310a4b436223d126f3690eda896
push id10854
push userryanvm@gmail.com
push dateSat, 04 Mar 2017 00:19:51 +0000
treeherdermozilla-aurora@e11b1a808700 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, lizzard
bugs1316879, 1299919
milestone53.0a2
Bug 1316879 - Don't use CPP/CXXCPP from environment after bug 1299919. r=glandium, a=lizzard MozReview-Commit-ID: 4Of9nsVWK3q
build/buildconfig.py
--- a/build/buildconfig.py
+++ b/build/buildconfig.py
@@ -11,10 +11,10 @@ config = MozbuildObject.from_environment
 for var in ('topsrcdir', 'topobjdir', 'defines', 'non_global_defines',
             'substs'):
     value = getattr(config, var)
     setattr(sys.modules[__name__], var, value)
 
 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]