From: David Crawshaw Date: Mon, 27 Jul 2015 20:40:40 +0000 (-0400) Subject: runtime/cgo: remove TMPDIR logic for iOS X-Git-Tag: go1.5beta3~43 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=249894ab6c4d8439e7fd47ca55ba618d636ab239;p=gostls13.git runtime/cgo: remove TMPDIR logic for iOS Seems like the simplest solution for 1.5. All the parts of the test suite I can run on my current device (for which my exception handler fix no longer works, apparently) pass without this code. I'll move it into x/mobile/app. Fixes #11884 Change-Id: I2da40c8c7b48a4c6970c4d709dd7c148a22e8727 Reviewed-on: https://go-review.googlesource.com/12721 Reviewed-by: Ian Lance Taylor --- diff --git a/src/runtime/cgo/tmpdir_darwin.go b/src/runtime/cgo/tmpdir_darwin.go deleted file mode 100644 index 1239c70de9..0000000000 --- a/src/runtime/cgo/tmpdir_darwin.go +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build arm arm64 - -package cgo - -/* -#cgo CFLAGS: -x objective-c -#cgo LDFLAGS: -framework CoreFoundation -framework Foundation - -#include -#include -#include - -char tmpdir[MAXPATHLEN]; - -char* loadtmpdir() { - tmpdir[0] = 0; - CFStringRef path = (CFStringRef)NSTemporaryDirectory(); - CFStringGetCString(path, tmpdir, sizeof(tmpdir), kCFStringEncodingUTF8); - return tmpdir; -} -*/ -import "C" - -func init() { - if Getenv("TMPDIR") != "" { - return - } - dir := C.GoString(C.loadtmpdir()) - if len(dir) == 0 { - return - } - if dir[len(dir)-1] == '/' { - dir = dir[:len(dir)-1] - } - Setenv("TMPDIR", dir) -}