commit e67d3d1c365056ce76c7dadda488479943b310be
author Dan Willemsen <dwillemsen@google.com> Thu Sep 08 20:55:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 08 20:55:04 2016 +0000
tree 13f73410aa172a70715f216508cc0bc29aaeae41
parent 59ac69507175ccd5f4fcf77830195f8d2f61fdd9
parent 4e3e6c76d0e5a6f06264fc993a10880ec50c7f8a

Merge "Blacklist the GOMACC_PATH environment variable" am: b2498a22c2
am: 4e3e6c76d0

Change-Id: Iec477fd5002a486d266b2926b21f901f5c8abf30

core/goma.mk

diff --git a/core/goma.mk b/core/goma.mk
index c0c27c5..52726be 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Used by the compiler wrapper, but should only be set by gomacc
+unexport GOMACC_PATH
+
 # Notice: this works only with Google's Goma build infrastructure.
 ifneq ($(filter-out false,$(USE_GOMA)),)
   # Goma requires a lot of processes and file descriptors.