[tor-commits] [tor-browser-build/master] Bug 32520: go: Remove go/pkg/obj/go-build/ from output

[boklm at torproject.org]

commit 0ab49005efd962074e80cafb52fe4dd9cb286229
Author: JeremyRand <biolizard89 at gmail.com>
Date:   Mon Dec 2 02:55:33 2019 +0000

    Bug 32520: go: Remove go/pkg/obj/go-build/ from output
---
 projects/go/build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/go/build b/projects/go/build
index 2ebfd58..06af067 100644
--- a/projects/go/build
+++ b/projects/go/build
@@ -73,6 +73,10 @@ cd /var/tmp/dist/go/src
   CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash
 [% END -%]
 
+# This directory is non-reproducible and doesn't exist in official Go releases,
+# so remove it to preserve reproducibility of the output.
+rm -rf /var/tmp/dist/go/pkg/obj/go-build/
+
 cd /var/tmp/dist
 [% c('tar', {
         tar_src => [ project ],