[tbb-commits] [tor-browser-build/master] Bug 23456: build go for Windows 64

[gk at torproject.org]

commit 83407b9eee94991a7c8c13dbcaf35693f0e7c9e9
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Sep 11 17:03:01 2017 +0200

    Bug 23456: build go for Windows 64
---
 projects/go/build  | 4 ++--
 projects/go/config | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/projects/go/build b/projects/go/build
index 3b51c32..5ab4c0c 100644
--- a/projects/go/build
+++ b/projects/go/build
@@ -64,11 +64,11 @@ cd /var/tmp/dist/go/src
   # https://github.com/golang/go/issues/15457
   CC_FOR_TARGET="$(pwd)/cc-for-target"
   echo "#!/bin/sh" > "$CC_FOR_TARGET"
-  echo "exec i686-w64-mingw32-gcc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET"
+  echo "exec [% c("arch") %]-w64-mingw32-gcc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET"
   chmod +x "$CC_FOR_TARGET"
   # http://golang.org/doc/install/source#environment
   export GOOS=windows
-  export GOARCH=386
+  export GOARCH=[% c("var/GOARCH") %]
   CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
 [% END -%]
 
diff --git a/projects/go/config b/projects/go/config
index 21669c9..2a3b1ad 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -52,10 +52,15 @@ var:
         }) %]
 
 targets:
-  windows-i686:
+  windows:
     var:
       GOOS: windows
+  windows-i686:
+    var:
       GOARCH: 386
+  windows-x86_64:
+    var:
+      GOARCH: amd64
   osx-x86_64:
     var:
       GOOS: darwin