Update PT build scripts to work on Intel Macs too

This commit is contained in:
Micah Lee 2023-02-06 18:31:02 -08:00
parent 8689cd87d7
commit b26e7cb0df
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 24 additions and 12 deletions

View File

@ -10,10 +10,14 @@ cd meek
git checkout $MEEK_TAG
if [ "$OS" == "Darwin" ]; then
go build -o ../../../onionshare/resources/tor/meek-client-arm64 ./meek-client
GOOS=darwin GOARCH=amd64 go build -o ../../../onionshare/resources/tor/meek-client-amd64 ./meek-client
lipo -create -output ../../../onionshare/resources/tor/meek-client ../../../onionshare/resources/tor/meek-client-arm64 ../../../onionshare/resources/tor/meek-client-amd64
rm ../../../onionshare/resources/tor/meek-client-arm64 ../../../onionshare/resources/tor/meek-client-amd64
if [[ $(uname -m) == 'arm64' ]]; then
go build -o ../../../onionshare/resources/tor/meek-client-arm64 ./meek-client
GOOS=darwin GOARCH=amd64 go build -o ../../../onionshare/resources/tor/meek-client-amd64 ./meek-client
lipo -create -output ../../../onionshare/resources/tor/meek-client ../../../onionshare/resources/tor/meek-client-arm64 ../../../onionshare/resources/tor/meek-client-amd64
rm ../../../onionshare/resources/tor/meek-client-arm64 ../../../onionshare/resources/tor/meek-client-amd64
elif [[ $(uname -m) == 'x86_64' ]]; then
go build -o ../../../onionshare/resources/tor/meek-client ./meek-client
fi
else
go build -o ../../../onionshare/resources/tor/meek-client ./meek-client
fi

View File

@ -9,10 +9,14 @@ git clone https://gitlab.com/yawning/obfs4 || echo "already cloned"
cd obfs4
git checkout $OBFS4PROXY_TAG
if [ "$OS" == "Darwin" ]; then
go build -o ../../../onionshare/resources/tor/obfs4proxy-arm64 ./obfs4proxy
GOOS=darwin GOARCH=amd64 go build -o ../../../onionshare/resources/tor/obfs4proxy-amd64 ./obfs4proxy
lipo -create -output ../../../onionshare/resources/tor/obfs4proxy ../../../onionshare/resources/tor/obfs4proxy-arm64 ../../../onionshare/resources/tor/obfs4proxy-amd64
rm ../../../onionshare/resources/tor/obfs4proxy-arm64 ../../../onionshare/resources/tor/obfs4proxy-amd64
if [[ $(uname -m) == 'arm64' ]]; then
go build -o ../../../onionshare/resources/tor/obfs4proxy-arm64 ./obfs4proxy
GOOS=darwin GOARCH=amd64 go build -o ../../../onionshare/resources/tor/obfs4proxy-amd64 ./obfs4proxy
lipo -create -output ../../../onionshare/resources/tor/obfs4proxy ../../../onionshare/resources/tor/obfs4proxy-arm64 ../../../onionshare/resources/tor/obfs4proxy-amd64
rm ../../../onionshare/resources/tor/obfs4proxy-arm64 ../../../onionshare/resources/tor/obfs4proxy-amd64
elif [[ $(uname -m) == 'x86_64' ]]; then
go build -o ../../../onionshare/resources/tor/obfs4proxy ./obfs4proxy
fi
else
go build -o ../../../onionshare/resources/tor/obfs4proxy ./obfs4proxy
fi

View File

@ -9,10 +9,14 @@ git clone https://git.torproject.org/pluggable-transports/snowflake.git || echo
cd snowflake
git checkout $SNOWFLAKE_TAG
if [ "$OS" == "Darwin" ]; then
go build -o ../../../onionshare/resources/tor/snowflake-client-arm64 ./client
GOOS=darwin GOARCH=amd64 go build -o ../../../onionshare/resources/tor/snowflake-client-amd64 ./client
lipo -create -output ../../../onionshare/resources/tor/snowflake-client ../../../onionshare/resources/tor/snowflake-client-arm64 ../../../onionshare/resources/tor/snowflake-client-amd64
rm ../../../onionshare/resources/tor/snowflake-client-arm64 ../../../onionshare/resources/tor/snowflake-client-amd64
if [[ $(uname -m) == 'arm64' ]]; then
go build -o ../../../onionshare/resources/tor/snowflake-client-arm64 ./client
GOOS=darwin GOARCH=amd64 go build -o ../../../onionshare/resources/tor/snowflake-client-amd64 ./client
lipo -create -output ../../../onionshare/resources/tor/snowflake-client ../../../onionshare/resources/tor/snowflake-client-arm64 ../../../onionshare/resources/tor/snowflake-client-amd64
rm ../../../onionshare/resources/tor/snowflake-client-arm64 ../../../onionshare/resources/tor/snowflake-client-amd64
elif [[ $(uname -m) == 'x86_64' ]]; then
go build -o ../../../onionshare/resources/tor/snowflake-client ./client
fi
else
go build -o ../../../onionshare/resources/tor/snowflake-client ./client
fi