commit 4dc664081ddc62cf303799e10ffacbcebab5c059
author Dan Willemsen <dwillemsen@google.com> Thu Sep 08 20:57:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 08 20:57:35 2016 +0000
tree 3fab72119d18a867829c79f896abf6a6be7ba737
parent e28fd9f2e4c6f31d7b860d282d1dda2209661908
parent e67d3d1c365056ce76c7dadda488479943b310be

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

Change-Id: Iab2457c07acd730091dd120b4ad7ebdf7fafe062

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.