Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(scripts/termux_setup_toolchain): fix CGO_LDFLAGS (#19855) 

`go build` error: unrecognized command-line option ‘-fno-openmp-implicit-rpath’
This commit is contained in:
tqfx 2024-04-26 18:18:15 +08:00 committed by GitHub
parent 98dad8fc6f
commit e8a81861d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/toolchain/termux_setup_toolchain_23c.sh
View File

@ -96,8 +96,8 @@ termux_setup_toolchain_23c() {
export GOOS=android
export CGO_ENABLED=1
export GO_LDFLAGS="-extldflags=-pie"
export CGO_LDFLAGS="${LDFLAGS/-Wl,-z,relro,-z,now/}"
CGO_LDFLAGS="${LDFLAGS/-static-openmp/}"
export CGO_LDFLAGS="${LDFLAGS/ -Wl,-z,relro,-z,now/}"
CGO_LDFLAGS="${CGO_LDFLAGS/ -static-openmp/}"
export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
export RUSTFLAGS="-C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib -C link-arg=-Wl,--enable-new-dtags"

9
scripts/build/toolchain/termux_setup_toolchain_26b.sh
View File

@ -69,8 +69,8 @@ termux_setup_toolchain_26b() {
# We might also want to consider shipping libomp.so instead; since r21
LDFLAGS+=" -fopenmp -static-openmp"
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
LDFLAGS+=" -fno-openmp-implicit-rpath"
fi
LDFLAGS+=" -fno-openmp-implicit-rpath"
fi
# Android 7 started to support DT_RUNPATH (but not DT_RPATH).
LDFLAGS+=" -Wl,--enable-new-dtags"
@ -100,8 +100,9 @@ termux_setup_toolchain_26b() {
export GOOS=android
export CGO_ENABLED=1
export GO_LDFLAGS="-extldflags=-pie"
export CGO_LDFLAGS="${LDFLAGS/-Wl,-z,relro,-z,now/}"
CGO_LDFLAGS="${LDFLAGS/-static-openmp/}"
export CGO_LDFLAGS="${LDFLAGS/ -Wl,-z,relro,-z,now/}"
CGO_LDFLAGS="${CGO_LDFLAGS/ -static-openmp/}"
CGO_LDFLAGS="${CGO_LDFLAGS/ -fno-openmp-implicit-rpath/}"
export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
export RUSTFLAGS="-C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib -C link-arg=-Wl,--enable-new-dtags"