0
0
mirror of https://github.com/bol-van/zapret.git synced 2025-07-02 19:43:08 +00:00

Merge branch 'master' into apple-silicon-fix

This commit is contained in:
NeteR_VezeR 2025-06-01 11:18:55 +03:00 committed by GitHub
commit a8cccb1793
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -80,6 +80,7 @@ check_bins()
fix_perms_bin_test "$EXEDIR"
local arch="$(get_bin_arch)"
local make_target
local cf="-march=native"
[ "$FORCE_BUILD" = "1" ] && {
echo forced build mode
if [ "$arch" = "my" ]; then
@ -95,26 +96,27 @@ check_bins()
case $SYSTEM in
macos)
make_target=mac
cf=
;;
systemd)
make_target=systemd
;;
esac
CFLAGS="-march=native ${CFLAGS}" make -C "$EXEDIR" $make_target || {
CFLAGS="${cf:+$cf }${CFLAGS}" make -C "$EXEDIR" $make_target || {
if [ "$SYSTEM" = macos ]; then
echo "retrying compile"
echo "removing quarantine attributes"
xattr -d com.apple.quarantine ./binaries/mac64/ip2net 2>/dev/null
xattr -d com.apple.quarantine ./binaries/mac64/mdig 2>/dev/null
xattr -d com.apple.quarantine ./binaries/mac64/tpws 2>/dev/null
make -C "$EXEDIR" $make_target || {
echo could not compile
make -C "$EXEDIR" clean 2>/dev/null
exitp 8
}
echo "retrying compile"
echo "trying to remove quarantine attributes if exist"
xattr -d com.apple.quarantine ./binaries/mac64/ip2net 2>/dev/null
xattr -d com.apple.quarantine ./binaries/mac64/mdig 2>/dev/null
xattr -d com.apple.quarantine ./binaries/mac64/tpws 2>/dev/null
CFLAGS="${cf:+$cf }${CFLAGS}" make -C "$EXEDIR" $make_target || {
echo could not compile
make -C "$EXEDIR" clean
exitp 8
}
else
echo could not compile
make -C "$EXEDIR" clean 2>/dev/null
make -C "$EXEDIR" clean
exitp 8
fi
}