[tbb-commits] [tor-browser-build/master] Bug 21710: Upgrade Go to 1.8.1.

[boklm at torproject.org]

commit 8b3f00023bad97241fdd2b50e0f033b57511b725
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Jun 2 13:04:02 2017 +0200

    Bug 21710: Upgrade Go to 1.8.1.
    
    Remove workaround for fixed upstream bug, GitHub #17732
    (__MAC_OS_X_VERSION_MAX_ALLOWED).
    
    I wasn't able to remove the cc-for-target workaround for GitHub #15457
    (CC_FOR_TARGET). Even though according to
    https://github.com/golang/go/issues/15457 it has been
    been fixed, make.bash still seems to lose all but the first argument of
    CC_FOR_TARGET somewhere.
    
    tor-browser-bundle.git author: David Fifield <david at bamsoftware.com>
    tor-browser-bundle.git commit: 9d546f20ae711e7df9c574d9bdfccf34ddf1b650
---
 projects/go/build  | 3 ---
 projects/go/config | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/projects/go/build b/projects/go/build
index b7fac08..98f0522 100644
--- a/projects/go/build
+++ b/projects/go/build
@@ -52,9 +52,6 @@ cd /var/tmp/dist/go/src
   # http://golang.org/doc/install/source#environment
   export GOOS=darwin
   export GOARCH=amd64
-  # Remove a preprocessor directive that causes problems when building with the 10.7 SDK.
-  # https://github.com/golang/go/issues/17732
-  sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go
   CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
 [% ELSIF c("var/windows") -%]
   # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS.
diff --git a/projects/go/config b/projects/go/config
index b36f211..1aa3052 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.7.5
+version: 1.8.1
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -77,7 +77,7 @@ input_files:
     enable: '[% c("var/windows") || c("var/osx") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
     name: go
-    sha256sum: 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815
+    sha256sum: 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959