[tor-commits] [tor-browser-build/master] Bug 27827: update go to 1.11.1

[gk at torproject.org]

commit 1ca5a195c785f70cac791117a4e12d49482a206f
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Oct 17 09:28:58 2018 -0600

    Bug 27827: update go to 1.11.1
    
    For some reason, this version of go requires setting
    _GLIBCXX_USE_CXX11_ABI=1 in the snowflake build, not only in go-webrtc.
    https://bugs.torproject.org/27827#comment:12
---
 projects/go/config       | 4 ++--
 projects/snowflake/build | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/projects/go/config b/projects/go/config
index 2a3b1ad..1841705 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.8.3
+version: 1.11.1
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -84,7 +84,7 @@ input_files:
     enable: '[% c("var/windows") || c("var/osx") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
     name: go
-    sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6
+    sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/snowflake/build b/projects/snowflake/build
index f3616f4..693d853 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -5,6 +5,11 @@
 [% IF c("var/linux") %]
   tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
   export PATH="/var/tmp/dist/binutils/bin:$PATH"
+  # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with
+  # the prebuilt libwebrtc-magic.a libraries. Since we build our own
+  # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here,
+  # using CGO_CXXFLAGS.
+  export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1"
 [% END -%]
 distdir=/var/tmp/dist/[% project %]
 [% c("var/set_PTDIR_DOCSDIR") -%]