[tor-commits] [builders/tor-browser-build] 02/02: Bug 40542: Remove not needed faketime wrapper for macOS

[gitolite role]

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master
in repository builders/tor-browser-build.

commit cf3ebd99c40b7263e0385e78505a6ae7b01922bd
Author: Georg Koppen <gk at torproject.org>
AuthorDate: Wed Jun 29 19:35:14 2022 +0000

    Bug 40542: Remove not needed faketime wrapper for macOS
---
 projects/go/build  | 7 +------
 projects/go/config | 2 --
 rbm.conf           | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/projects/go/build b/projects/go/build
index b5162e6..9da7cf2 100644
--- a/projects/go/build
+++ b/projects/go/build
@@ -51,12 +51,7 @@ cd /var/tmp/dist/go/src
   echo "#!/bin/sh" > "$CC_FOR_TARGET"
   echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET"
   chmod +x "$CC_FOR_TARGET"
-  # faketime is needed because clang 3.9.1 on Darwin embeds the timestamps of
-  # certain intermediate object files (including those that arise here while
-  # compiling the Go runtime itself). Without this, variable timestamps would
-  # end up in snowflake-client.
-  # https://github.com/golang/go/issues/9206#issuecomment-310476743
-  CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= [% c("var/faketime") %] ./make.bash
+  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.
   # Go's CC_FOR_TARGET only allows a command name, not a command with arguments.
diff --git a/projects/go/config b/projects/go/config
index ad53be9..a043bda 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -84,8 +84,6 @@ targets:
     var:
       GOOS: darwin
       GOARCH: amd64
-      arch_deps:
-        - faketime
   linux:
     var:
       GOOS: linux
diff --git a/rbm.conf b/rbm.conf
index 6d0b370..c2191ff 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -97,7 +97,6 @@ var:
       # disable network in the build scripts
       build: 1
 
-  faketime: "faketime -f \"[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]\""
   touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]"
 
   locale_ja: ja

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.