mirrors/zapret
0
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-07-03 03:53:03 +00:00
Code

Merge branch 'master' into apple-silicon-fix

Browse Source
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
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
install_easy.sh
View File

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