From: Elias Naur <elias.naur@gmail.com>
Date: Wed, 2 May 2018 18:13:14 +0000 (+0200)
Subject: misc/ios: don't override TMPDIR on idevice
X-Git-Tag: go1.11beta1~563
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8cd0094b4ee6b51c49f96de98308701108b45995;p=gostls13.git

misc/ios: don't override TMPDIR on idevice

If TMPDIR is not set, the iOS runtime will automatically set TMPDIR
to a valid app temporary path.

For the iOS builders.

Change-Id: Ia82404059dcb10678f0a6e0c96d5efc79a5485fd
Reviewed-on: https://go-review.googlesource.com/110956
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/misc/ios/go_darwin_arm_exec.go b/misc/ios/go_darwin_arm_exec.go
index 6138878e20..6c5a913bc6 100644
--- a/misc/ios/go_darwin_arm_exec.go
+++ b/misc/ios/go_darwin_arm_exec.go
@@ -403,6 +403,15 @@ func run(appdir, deviceapp string, args []string) error {
 		deviceapp,
 	)
 	lldb.Args = append(lldb.Args, args...)
+	var env []string
+	for _, e := range os.Environ() {
+		// Don't override TMPDIR on the device.
+		if strings.HasPrefix(e, "TMPDIR=") {
+			continue
+		}
+		env = append(env, e)
+	}
+	lldb.Env = env
 	lldb.Stdin = strings.NewReader(lldbDriver)
 	lldb.Stdout = os.Stdout
 	lldb.Stderr = os.Stderr