Skip to content

Commit 0a60a1c

Browse files
committed
downloads: upgrade LLVM/Clang to 12.0.0
Released just a few minutes ago. It looks like the new version requires Python 3. So we install that instead of Python 2 in the build environment.
1 parent 91664a1 commit 0a60a1c

File tree

4 files changed

+39
-25
lines changed

4 files changed

+39
-25
lines changed

cpython-unix/build-clang-linux64.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ pushd llvm/projects/libcxxabi
7777
tar --strip-components=1 -xf ${ROOT}/libcxxabi-${LIBCXXABI_VERSION}.src.tar.xz
7878
popd
7979

80+
mkdir libunwind
81+
pushd libunwind
82+
tar --strip-components=1 -xf ${ROOT}/libunwind-${LIBUNWIND_VERSION}.src.tar.xz
83+
popd
84+
8085
mkdir llvm-objdir
8186
pushd llvm-objdir
8287

cpython-unix/build.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ def build_clang(client, image, host_platform):
314314
llvm_archive = download_entry("llvm", DOWNLOADS_PATH)
315315
libcxx_archive = download_entry("libc++", DOWNLOADS_PATH)
316316
libcxxabi_archive = download_entry("libc++abi", DOWNLOADS_PATH)
317+
libunwind_archive = download_entry("libunwind", DOWNLOADS_PATH)
317318

318319
with build_environment(client, image) as build_env:
319320
install_sccache(build_env)
@@ -328,6 +329,7 @@ def build_clang(client, image, host_platform):
328329
llvm_archive,
329330
libcxx_archive,
330331
libcxxabi_archive,
332+
libunwind_archive,
331333
):
332334
build_env.copy_file(a)
333335

@@ -344,6 +346,7 @@ def build_clang(client, image, host_platform):
344346
"GCC_VERSION": DOWNLOADS["gcc"]["version"],
345347
"LIBCXX_VERSION": DOWNLOADS["libc++"]["version"],
346348
"LIBCXXABI_VERSION": DOWNLOADS["libc++abi"]["version"],
349+
"LIBUNWIND_VERSION": DOWNLOADS["libunwind"]["version"],
347350
"LLD_VERSION": DOWNLOADS["lld"]["version"],
348351
"LLVM_VERSION": DOWNLOADS["llvm"]["version"],
349352
}

cpython-unix/clang.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ RUN apt-get install \
33
libc6-dev \
44
libc6-dev:i386 \
55
patch \
6-
python \
6+
python3 \
77
tar \
88
xz-utils \
99
unzip \

pythonbuild/downloads.py

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
"license_file": "LICENSE.bzip2.txt",
3030
},
3131
"clang": {
32-
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/clang-11.1.0.src.tar.xz",
33-
"size": 14850272,
34-
"sha256": "0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b",
35-
"version": "11.1.0",
32+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang-12.0.0.src.tar.xz",
33+
"size": 15321640,
34+
"sha256": "e26e452e91d4542da3ebbf404f024d3e1cbf103f4cd110c26bf0a19621cca9ed",
35+
"version": "12.0.0",
3636
},
3737
"clang-compiler-rt": {
38-
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/compiler-rt-11.1.0.src.tar.xz",
39-
"size": 2135988,
40-
"sha256": "def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274",
41-
"version": "11.1.0",
38+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/compiler-rt-12.0.0.src.tar.xz",
39+
"size": 2201104,
40+
"sha256": "85a8cd0a62413eaa0457d8d02f8edac38c4dc0c96c00b09dc550260c23268434",
41+
"version": "12.0.0",
4242
},
4343
"cmake-linux-bin": {
4444
"url": "https://github.com/Kitware/CMake/releases/download/v3.19.2/cmake-3.19.2-Linux-x86_64.tar.gz",
@@ -135,16 +135,16 @@
135135
"version": "1.0.7",
136136
},
137137
"libc++": {
138-
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/libcxx-11.1.0.src.tar.xz",
139-
"size": 1871804,
140-
"sha256": "bb233d250ed7eaa05c73eaf81ef0f9ee3fac9d8fc0c3d38a7a7383f82ed6f8e5",
141-
"version": "11.1.0",
138+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libcxx-12.0.0.src.tar.xz",
139+
"size": 1880864,
140+
"sha256": "7dcb75ca4f6aae2c677d128460c48a57398c8b6791b77b74bea7cf9e04e7c3f1",
141+
"version": "12.0.0",
142142
},
143143
"libc++abi": {
144-
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/libcxxabi-11.1.0.src.tar.xz",
145-
"size": 553032,
146-
"sha256": "143193ed80f8fa4d85211d6704a90789fb36aa65b69fd0c382a9f05ec370ecab",
147-
"version": "11.1.0",
144+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libcxxabi-12.0.0.src.tar.xz",
145+
"size": 552940,
146+
"sha256": "6ab8e8cd148a7d5103067e05c36e36ef36e27634fc8e73b5712853c9affe75b1",
147+
"version": "12.0.0",
148148
},
149149
"libedit": {
150150
"url": "https://thrysoee.dk/editline/libedit-20210216-3.1.tar.gz",
@@ -179,6 +179,12 @@
179179
"licenses": ["OpenSSL"],
180180
"license_file": "LICENSE.libressl.txt",
181181
},
182+
"libunwind": {
183+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libunwind-12.0.0.src.tar.xz",
184+
"size": 98344,
185+
"sha256": "9ed2a5b28853f7f58be9d04836ff43d6e4132df5a2c058b690dc3e9d75bd1cf5",
186+
"version": "12.0.0",
187+
},
182188
"libX11": {
183189
"url": "ftp://mirror.csclub.uwaterloo.ca/x.org/pub/current/src/lib/libX11-1.6.8.tar.gz",
184190
"size": 3144482,
@@ -207,16 +213,16 @@
207213
"license_file": "LICENSE.libxcb.txt",
208214
},
209215
"lld": {
210-
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/lld-11.1.0.src.tar.xz",
211-
"size": 1237068,
212-
"sha256": "017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce",
213-
"version": "11.1.0",
216+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/lld-12.0.0.src.tar.xz",
217+
"size": 1351536,
218+
"sha256": "2cb7d497f3ce33ce8a2c50ad26ec93a8c45f57268d4d96953cd0f25566f753fd",
219+
"version": "12.0.0",
214220
},
215221
"llvm": {
216-
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/llvm-11.1.0.src.tar.xz",
217-
"size": 38915280,
218-
"sha256": "ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5",
219-
"version": "11.1.0",
222+
"url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/llvm-12.0.0.src.tar.xz",
223+
"size": 42876732,
224+
"sha256": "49dc47c8697a1a0abd4ee51629a696d7bfe803662f2a7252a3b16fc75f3a8b50",
225+
"version": "12.0.0",
220226
},
221227
"mpc": {
222228
"url": "http://www.multiprecision.org/downloads/mpc-1.0.3.tar.gz",

0 commit comments

Comments
 (0)