Skip to content

Commit c5214b3

Browse files
committed
toolchain: deprecated gcc-9 and gcc-10
1 parent 933c450 commit c5214b3

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

common-files/setup_toolchain_gcc.sh

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -263,30 +263,6 @@ _setup_toolchain_ndk_gcc_11() {
263263
_setup_toolchain_gcc_envs_with_fc
264264
}
265265

266-
_setup_toolchain_ndk_gcc_10() {
267-
local GCC_TOOLCHAIN_VERSION=2
268-
269-
local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
270-
local GCC_VERSION=$(jq -r '.["10"].version' $PREBUILT_GCC_JSON)
271-
local GCC_TOOLCHAIN_REVISION=$(jq -r '.["10"].revision' $PREBUILT_GCC_JSON)
272-
local GCC_PREBUILT_SHA256=$(jq -r ".[\"10\"].checksums.$TERMUX_ARCH" $PREBUILT_GCC_JSON)
273-
274-
_setup_standalone_toolchain_current_ndk_newer_gcc "$GCC_VERSION" "$GCC_TOOLCHAIN_REVISION" "$GCC_PREBUILT_SHA256" "$GCC_TOOLCHAIN_VERSION"
275-
_setup_toolchain_gcc_envs_with_fc
276-
}
277-
278-
_setup_toolchain_ndk_gcc_9() {
279-
local GCC_TOOLCHAIN_VERSION=2
280-
281-
local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
282-
local GCC_VERSION=$(jq -r '.["9"].version' $PREBUILT_GCC_JSON)
283-
local GCC_TOOLCHAIN_REVISION=$(jq -r '.["9"].revision' $PREBUILT_GCC_JSON)
284-
local GCC_PREBUILT_SHA256=$(jq -r ".[\"9\"].checksums.$TERMUX_ARCH" $PREBUILT_GCC_JSON)
285-
286-
_setup_standalone_toolchain_current_ndk_newer_gcc "$GCC_VERSION" "$GCC_TOOLCHAIN_REVISION" "$GCC_PREBUILT_SHA256" "$GCC_TOOLCHAIN_VERSION"
287-
_setup_toolchain_gcc_envs_with_fc
288-
}
289-
290266
_setup_toolchain_ndk_gcc_12() {
291267
local GCC_TOOLCHAIN_VERSION=2
292268

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
_setup_toolchain_ndk_gcc_10() {
2+
local GCC_TOOLCHAIN_VERSION=2
3+
4+
local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
5+
local GCC_VERSION=$(jq -r '.["10"].version' $PREBUILT_GCC_JSON)
6+
local GCC_TOOLCHAIN_REVISION=$(jq -r '.["10"].revision' $PREBUILT_GCC_JSON)
7+
local GCC_PREBUILT_SHA256=$(jq -r ".[\"10\"].checksums.$TERMUX_ARCH" $PREBUILT_GCC_JSON)
8+
9+
_setup_standalone_toolchain_current_ndk_newer_gcc "$GCC_VERSION" "$GCC_TOOLCHAIN_REVISION" "$GCC_PREBUILT_SHA256" "$GCC_TOOLCHAIN_VERSION"
10+
_setup_toolchain_gcc_envs_with_fc
11+
}
12+
13+
_setup_toolchain_ndk_gcc_9() {
14+
local GCC_TOOLCHAIN_VERSION=2
15+
16+
local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
17+
local GCC_VERSION=$(jq -r '.["9"].version' $PREBUILT_GCC_JSON)
18+
local GCC_TOOLCHAIN_REVISION=$(jq -r '.["9"].revision' $PREBUILT_GCC_JSON)
19+
local GCC_PREBUILT_SHA256=$(jq -r ".[\"9\"].checksums.$TERMUX_ARCH" $PREBUILT_GCC_JSON)
20+
21+
_setup_standalone_toolchain_current_ndk_newer_gcc "$GCC_VERSION" "$GCC_TOOLCHAIN_REVISION" "$GCC_PREBUILT_SHA256" "$GCC_TOOLCHAIN_VERSION"
22+
_setup_toolchain_gcc_envs_with_fc
23+
}

0 commit comments

Comments
 (0)