Merge "Blacklist the GOMACC_PATH environment variable"
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.