Skip to content

Commit

Permalink
Update patch
Browse files Browse the repository at this point in the history
  • Loading branch information
truboxl committed Jul 7, 2024
1 parent 6f72c24 commit f3021d4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 43 deletions.
1 change: 0 additions & 1 deletion build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export TERMUX_NDK_VERSION_LATEST=$(. "$REPOROOT/termux-packages/scripts/properti
export TERMUX_ARCH
export TERMUX_NDK_VERSION_NUM
export TERMUX_NDK_REVISION
export TERMUX_PKG_ENABLE_CLANG16_PORTING=false

pushd "$REPOROOT/termux-packages"
git reset --hard
Expand Down
42 changes: 0 additions & 42 deletions termux-packages.arm-vfpv3-d16.lf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -100,45 +100,3 @@ index 7b9be5459..9e99b2fd3 100644
LDFLAGS+=" -march=armv7-a"
export GOARCH=arm
export GOARM=7
diff --git a/scripts/build/setup/termux_setup_no_integrated_as.sh b/scripts/build/setup/termux_setup_no_integrated_as.sh
index f4d02ec6c..814c11c3b 100644
--- a/scripts/build/setup/termux_setup_no_integrated_as.sh
+++ b/scripts/build/setup/termux_setup_no_integrated_as.sh
@@ -28,18 +28,27 @@ termux_setup_no_integrated_as() {
for env in CC CXX; do
local cmd="$(eval echo \${$env})"
local w="$bin/$(basename "$cmd")"
- if [ ! -e "$w" ]; then
- cat > "$w" <<-EOF
- #!$(command -v sh)
- PATH="$binutils_cross_bin:\$PATH"
- exec "$(command -v "$cmd")" \
- --start-no-unused-arguments \
- -fno-integrated-as \
- --end-no-unused-arguments \
- "\$@"
+ if [ -e "$w" ]; then return; fi
+ if [[ "$(${cmd} -dumpversion | sed "s|\..*||")" -ge 14 ]]; then
+ cat > "$w" <<- EOF
+ #!$(command -v sh)
+ PATH="$binutils_cross_bin:\$PATH"
+ exec "$(command -v "$cmd")" \
+ --start-no-unused-arguments \
+ -fno-integrated-as \
+ --end-no-unused-arguments \
+ "\$@"
+ EOF
+ else
+ cat > "$w" <<- EOF
+ #!$(command -v sh)
+ PATH="$binutils_cross_bin:\$PATH"
+ exec "$(command -v "$cmd")" \
+ -fno-integrated-as \
+ "\$@"
EOF
- chmod 0700 "$w"
fi
+ chmod 0700 "$w"
done
export PATH="$bin:$PATH"
}

0 comments on commit f3021d4

Please sign in to comment.