[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41705: Remove unnecessary workaround in projects/go/build

Title: GitLab

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 9e702e7a
    by Nicolas Vigier at 2026-01-29T10:33:24+01:00 
    Bug 41705: Remove unnecessary workaround in projects/go/build

A workaround for https://github.com/golang/go/issues/15457 was added a
long time ago, but is not necessary anymore.

1 changed file:

Changes:

  • projects/go/build
    ... ... @@ -22,26 +22,12 @@ cd /var/tmp/dist/go/src
    22 22 
     [% IF c("var/linux") -%]
    23 23 
       ./make.bash
    24 24 
     [% ELSIF c("var/macos") -%]
    25 
    -  unset LDFLAGS
    26 25 
       rm -Rf $clangdir/helpers
    27 
    -  export CC="$clangdir/bin/clang [% c('var/FLAGS') %]"
    28 
    -  # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS.
    29 
    -  # Go's CC_FOR_TARGET only allows a command name, not a command with arguments.
    30 
    -  # https://github.com/golang/go/issues/15457
    31 
    -  CC_FOR_TARGET="$(pwd)/cc-for-target"
    32 
    -  echo "#!/bin/sh" > "$CC_FOR_TARGET"
    33 
    -  echo "exec $CC \"\$@\"" >> "$CC_FOR_TARGET"
    34 
    -  chmod +x "$CC_FOR_TARGET"
    35 
    -  CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
    26 
    +  CGO_ENABLED=1 CC_FOR_TARGET="$clangdir/bin/clang [% c('var/FLAGS') %]" \
    27 
    +    CC= CFLAGS= LDFLAGS= ./make.bash
    36 28 
     [% ELSIF c("var/windows") -%]
    37 
    -  # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS.
    38 
    -  # Go's CC_FOR_TARGET only allows a command name, not a command with arguments.
    39 
    -  # https://github.com/golang/go/issues/15457
    40 
    -  CC_FOR_TARGET="$(pwd)/cc-for-target"
    41 
    -  echo "#!/bin/sh" > "$CC_FOR_TARGET"
    42 
    -  echo "exec [% c("arch") %]-w64-mingw32-cc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET"
    43 
    -  chmod +x "$CC_FOR_TARGET"
    44 
    -  CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
    29 
    +  CC_FOR_TARGET='[% c("arch") %]-w64-mingw32-cc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]' \
    30 
    +    CGO_ENABLED=1 CC= CFLAGS= LDFLAGS= ./make.bash
    45 31 
     [% ELSIF c("var/android") -%]
    46 32 
       CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CC= CFLAGS= LDFLAGS= ./make.bash
    47 33 
     [% END -%]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9e702e7a7b372f4d40c9cfd4748ae87c9316d258 at 1769679248 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx