Skip to content

Commit c054790

Browse files
committed
Upgrade toolchain to musl 1.2.5.1.
1 parent 7633fd4 commit c054790

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

ci/ci_common/musl-common.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
musl_dependency:: {
44
downloads+: {
55
MUSL_TOOLCHAIN: {
6-
name: 'toolchain-gcc-10.2.1-musl',
7-
version: '1.2.2',
6+
name: 'toolchain-gcc-10.3.0-zlib-1.2.13-musl',
7+
version: '1.2.5.1',
88
platformspecific: true,
99
},
1010
},

sdk/mx.sdk/suite.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@
228228
"os_arch": {
229229
"linux": {
230230
"amd64": {
231-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-amd64.tar.gz"],
232-
"digest" : "sha512:8f49b04d4826c560c791e5223f504046fa0daa6b79e581ea1781a2d01f4efe2de4a0fb6771dc1b07318ab0109a61ea3b04255eadf36191a76687f873931eb283",
231+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.3.0-zlib-1.2.13-musl-1.2.5.1-linux-amd64.tar.gz"],
232+
"digest" : "sha512:a4be5d7f0a0857e30992079b39b0b7a00b80b4f255a0dddf8e4208d53c0a2a79ad26dbcb3e7b4018bfc1ef5751cf2bf7180c64d6b13dd4c80ed2dd0335945736",
233233
},
234234
"aarch64": {
235-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-aarch64.tar.gz"],
236-
"digest" : "sha512:f5545f6b36c2306861c026895d437a57357515e8dfefb0e8419413f61b146f42dc072f8a8a7a9f4885d6448396d656f59264e61e3f5eedd278486228aa58904e",
235+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.3.0-zlib-1.2.13-musl-1.2.5.1-linux-aarch64.tar.gz"],
236+
"digest" : "sha512:7f645bceaad864e6a0cf3289ca234e76819f7bfc06abf0c82b59e51e152191235b65c3b7f4e9baa2f2c2982459ffec2c284d99cc28bf7923eb9022eef03ad72d",
237237
},
238238
"<others>": {
239239
"optional": True,
@@ -1626,9 +1626,9 @@ class UniversalDetector {
16261626
"source_type": "string",
16271627
"value": '''
16281628
include <ninja-toolchain:GCC_NINJA_TOOLCHAIN>
1629-
CC=<path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/gcc
1630-
CXX=<path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/g++
1631-
AR=<path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/ar
1629+
CC=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-gcc
1630+
CXX=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-g++
1631+
AR=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-ar
16321632
CFLAGS=
16331633
CXXFLAGS=
16341634
LDFLAGS=
@@ -1646,9 +1646,9 @@ class UniversalDetector {
16461646
"source_type": "string",
16471647
"value": '''
16481648
include <ninja-toolchain:GCC_NINJA_TOOLCHAIN>
1649-
CC=<path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/gcc
1650-
CXX=<path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/g++
1651-
AR=<path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/ar
1649+
CC=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-gcc
1650+
CXX=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-g++
1651+
AR=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-ar
16521652
CFLAGS=
16531653
CXXFLAGS=
16541654
LDFLAGS=
@@ -1688,9 +1688,9 @@ class UniversalDetector {
16881688
"toolchain.cmake" : {
16891689
"source_type": "string",
16901690
"value": '''
1691-
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/gcc)
1692-
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/g++)
1693-
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/ar)
1691+
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-gcc)
1692+
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-g++)
1693+
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-ar)
16941694
'''
16951695
},
16961696
},
@@ -1703,9 +1703,9 @@ class UniversalDetector {
17031703
"toolchain.cmake" : {
17041704
"source_type": "string",
17051705
"value": '''
1706-
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/gcc)
1707-
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/g++)
1708-
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/ar)
1706+
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-gcc)
1707+
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-g++)
1708+
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-ar)
17091709
'''
17101710
},
17111711
},

0 commit comments

Comments
 (0)