aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>2015-07-14 13:46:55 +0900
committerFumitoshi Ukai <fumitoshi.ukai@gmail.com>2015-07-14 13:46:55 +0900
commit8a97a88bc1237a8c0b71fdbe104f6cb151188af9 (patch)
tree3d4535f36ae3a52ad907a810164b209afe37966c
parent9dd48a99a4a89ca47dd366d9c01df9b64ed81fc7 (diff)
downloadandroid_build_kati-8a97a88bc1237a8c0b71fdbe104f6cb151188af9.tar.gz
android_build_kati-8a97a88bc1237a8c0b71fdbe104f6cb151188af9.tar.bz2
android_build_kati-8a97a88bc1237a8c0b71fdbe104f6cb151188af9.zip
[go] backport [C++] Remove *_WRAPPER automatically
commit cc87ad523788389f73aaf77cd3cc71acd3b76275
-rw-r--r--cmd/kati/main.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/cmd/kati/main.go b/cmd/kati/main.go
index 5220405..4d526be 100644
--- a/cmd/kati/main.go
+++ b/cmd/kati/main.go
@@ -165,6 +165,14 @@ func m2nsetup() {
}
func gomasetup() {
+ for _, k := range []string{"CC_WRAPPER", "CXX_WRAPPER", "JAVAC_WRAPPER"} {
+ v := os.Getenv(k)
+ if v != "" {
+ fmt.Printf("Note: %s=%s may confuse m2n --goma, unsetting", k, v)
+ os.Unsetenv(k)
+ }
+ }
+
if gomaDir == "" {
gomaDir = os.Getenv("GOMA_DIR")
if gomaDir == "" {