Skip to content

Commit ac6f3e2

Browse files
committed
fix(main/cmake): disable ld.gold completely
- Fixes #28784 - Fixes `clang++: error: invalid linker name in argument '-fuse-ld=gold'` in `pip install levenshtein` - Termux does not have `ld.gold` anymore
1 parent 5a57f59 commit ac6f3e2

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Fixes
2+
clang++: error: invalid linker name in argument '-fuse-ld=gold'
3+
in
4+
pip install levenshtein
5+
Termux does not have ld.gold anymore
6+
7+
--- a/Modules/Compiler/Clang.cmake
8+
+++ b/Modules/Compiler/Clang.cmake
9+
@@ -81,10 +81,6 @@ else()
10+
set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
11+
endif()
12+
13+
- if(ANDROID AND NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL "22")
14+
- # https://github.com/android-ndk/ndk/issues/242
15+
- set(CMAKE_${lang}_LINK_OPTIONS_IPO "-fuse-ld=gold")
16+
- endif()
17+
18+
if(ANDROID OR __is_apple_clang)
19+
set(__ar "${CMAKE_AR}")

packages/cmake/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ TERMUX_PKG_LICENSE_FILE="LICENSE.rst"
55
TERMUX_PKG_MAINTAINER="@termux"
66
# When updating version here, please update termux_setup_cmake.sh as well.
77
TERMUX_PKG_VERSION="4.2.3"
8-
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:3}/cmake-${TERMUX_PKG_VERSION}.tar.gz
8+
TERMUX_PKG_REVISION=1
9+
TERMUX_PKG_SRCURL="https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:3}/cmake-${TERMUX_PKG_VERSION}.tar.gz"
910
TERMUX_PKG_SHA256=7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac8a11e9
1011
TERMUX_PKG_AUTO_UPDATE=true
1112
TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
@@ -23,7 +24,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
2324
-DCMAKE_USE_SYSTEM_LIBRHASH=ON
2425
-DCMAKE_USE_SYSTEM_LIBUV=ON
2526
-DCMAKE_USE_SYSTEM_ZLIB=ON
26-
-DBUILD_CursesDialog=ON"
27+
-DBUILD_CursesDialog=ON
28+
"
2729

2830
termux_pkg_auto_update() {
2931
local TERMUX_SETUP_CMAKE="${TERMUX_SCRIPTDIR}/scripts/build/setup/termux_setup_cmake.sh"

0 commit comments

Comments
 (0)