Skip to content

Commit 5d62fb3

Browse files
author
Marc-André Moreau
committed
prepare 2025.2.0 release
1 parent e52f7ea commit 5d62fb3

10 files changed

+39
-197
lines changed

‎.github/workflows/cctools-prebuilt.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ jobs:
88
fail-fast: false
99
matrix:
1010
arch: [ x86_64, aarch64 ]
11-
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
11+
os: [ ubuntu-22.04, ubuntu-24.04 ]
1212

1313
include:
14-
- os: ubuntu-20.04
15-
arch: x86_64
16-
runner: ubuntu-20.04
1714
- os: ubuntu-22.04
1815
arch: x86_64
1916
runner: ubuntu-22.04
@@ -27,10 +24,6 @@ jobs:
2724
arch: aarch64
2825
runner: ubuntu-24.04-arm
2926

30-
exclude:
31-
- os: ubuntu-20.04
32-
arch: aarch64
33-
3427
steps:
3528
- name: Configure Linux runner
3629
run: |

‎.github/workflows/halide-prebuilt.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
arch: [ x86_64, aarch64 ]
17-
os: [ windows, macos, ubuntu-20.04, ubuntu-22.04 ]
17+
os: [ windows, macos, ubuntu-22.04, ubuntu-24.04 ]
1818
version: [ 16.0.0, 18.0.0 ]
1919

2020
include:
2121
- os: windows
2222
runner: windows-2022
2323
- os: macos
2424
runner: macos-latest
25-
- os: ubuntu-20.04
26-
runner: ubuntu-20.04
2725
- os: ubuntu-22.04
2826
runner: ubuntu-22.04
27+
- os: ubuntu-24.04
28+
runner: ubuntu-24.04
2929

3030
- arch: x86_64
3131
os: windows

‎.github/workflows/llvm-prebuilt.yml

+16-20
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ jobs:
88
fail-fast: false
99
matrix:
1010
arch: [ x86_64, aarch64 ]
11-
os: [ windows, macos, ubuntu-20.04, ubuntu-22.04 ]
12-
version: [ 14.0.6, 16.0.6, 18.1.8 ]
11+
os: [ windows, macos, ubuntu-22.04, ubuntu-24.04 ]
12+
version: [ 16.0.6, 18.1.8 ]
1313

1414
include:
15-
- version: 14.0.6
16-
branch: release/14.x
1715
- version: 16.0.6
1816
branch: release/16.x
1917
- version: 18.1.8
@@ -23,10 +21,10 @@ jobs:
2321
runner: windows-2022
2422
- os: macos
2523
runner: macos-latest
26-
- os: ubuntu-20.04
27-
runner: ubuntu-20.04
2824
- os: ubuntu-22.04
2925
runner: ubuntu-22.04
26+
- os: ubuntu-24.04
27+
runner: ubuntu-24.04
3028

3129
- arch: x86_64
3230
os: windows
@@ -73,10 +71,12 @@ jobs:
7371
7472
sudo apt install libxml2-dev
7573
mkdir libxml2-dev-arm64 && cd libxml2-dev-arm64
76-
$LibXmlDebFile = if ($(lsb_release -rs) -eq '20.04') {
77-
"libxml2-dev_2.9.10+dfsg-5ubuntu0.20.04.7_arm64.deb"
78-
} else {
74+
$LibXmlDebFile = if ($(lsb_release -rs) -eq '22.04') {
75+
# https://packages.ubuntu.com/jammy/arm64/libxml2-dev/download
7976
"libxml2-dev_2.9.13+dfsg-1build1_arm64.deb"
77+
} else {
78+
# https://packages.ubuntu.com/noble/arm64/libxml2-dev/download
79+
"libxml2-dev_2.9.14+dfsg-1.3ubuntu3_arm64.deb"
8080
}
8181
wget -q "http://ports.ubuntu.com/pool/main/libx/libxml2/$LibXmlDebFile"
8282
ar -x "$LibXmlDebFile"
@@ -90,10 +90,12 @@ jobs:
9090
9191
sudo apt install zlib1g-dev
9292
mkdir zlib1g-dev-arm64 && cd zlib1g-dev-arm64
93-
$ZlibDebFile = if ($(lsb_release -rs) -eq '20.04') {
94-
"zlib1g-dev_1.2.11.dfsg-2ubuntu1_arm64.deb"
95-
} else {
93+
$ZlibDebFile = if ($(lsb_release -rs) -eq '22.04') {
94+
# https://packages.ubuntu.com/jammy/arm64/zlib1g-dev/download
9695
"zlib1g-dev_1.2.11.dfsg-2ubuntu9_arm64.deb"
96+
} else {
97+
# https://packages.ubuntu.com/noble/arm64/zlib1g-dev/download
98+
"zlib1g-dev_1.3.dfsg-3.1ubuntu2_arm64.deb"
9799
}
98100
wget -q "http://ports.ubuntu.com/pool/main/z/zlib/$ZlibDebFile"
99101
ar -x "$ZlibDebFile"
@@ -120,11 +122,7 @@ jobs:
120122
- name: Patch LLVM
121123
shell: pwsh
122124
run: |
123-
if ('${{matrix.version}}' -eq '14.0.6') {
124-
git -C llvm-project apply ../llvm-prebuilt/patches/llvm-14-add-lld-install-targets.patch
125-
git -C llvm-project apply ../llvm-prebuilt/patches/llvm-14-add-llvm-name-prefix-to-llc-lli-opt-tools.patch
126-
git -C llvm-project apply ../llvm-prebuilt/patches/llvm-14-force-disable-clang-ast-introspection.patch
127-
} elseif ('${{matrix.version}}' -eq '16.0.6') {
125+
if ('${{matrix.version}}' -eq '16.0.6') {
128126
git -C llvm-project apply ../llvm-prebuilt/patches/llvm-16-add-lld-install-targets.patch
129127
git -C llvm-project apply ../llvm-prebuilt/patches/llvm-16-add-llvm-name-prefix-to-llc-lli-opt-tools.patch
130128
git -C llvm-project apply ../llvm-prebuilt/patches/llvm-16-force-disable-clang-ast-introspection.patch
@@ -151,9 +149,7 @@ jobs:
151149
shell: pwsh
152150
run: |
153151
cmake --build llvm-host --target llvm-tblgen clang-tblgen llvm-config
154-
if ('${{matrix.version}}' -ne '14.0.6') {
155-
cmake --build llvm-host --target clang-tidy-confusable-chars-gen clang-pseudo-gen
156-
}
152+
cmake --build llvm-host --target clang-tidy-confusable-chars-gen clang-pseudo-gen
157153
$HostBinPath = "$Env:GITHUB_WORKSPACE/llvm-host/bin"
158154
$ExeExt = if ($IsWindows) { ".exe" } else { "" }
159155
echo "LLVM_NATIVE_TOOL_DIR=$HostBinPath" >> $Env:GITHUB_ENV

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ This is a repository to create prebuilt clang+llvm distributions for major opera
44

55
## clang-llvm
66

7-
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04 | Ubuntu 24.04
8-
----------------------|--------------------|--------------------|--------------------|--------------------|--------------------
9-
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :white_large_square:
10-
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :white_large_square:
7+
Arch | Windows | macOS | Ubuntu 22.04 | Ubuntu 24.04 |
8+
----------------------|--------------------|--------------------|--------------------|--------------------|
9+
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
10+
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
1111

1212
## ctools
1313

14-
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04 | Ubuntu 24.04
15-
----------------------|--------------------|--------------------|--------------------|--------------------|--------------------
16-
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :white_large_square:
17-
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :white_large_square: | :heavy_check_mark:| :white_large_square:
14+
Arch | Windows | macOS | Ubuntu 22.04 | Ubuntu 24.04 |
15+
----------------------|--------------------|--------------------|--------------------|--------------------|
16+
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
17+
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
1818

1919
## Halide
2020

21-
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04 | Ubuntu 24.04
22-
----------------------|--------------------|--------------------|--------------------|--------------------|--------------------
23-
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
24-
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
21+
Arch | Windows | macOS | Ubuntu 22.04 | Ubuntu 24.04 |
22+
----------------------|--------------------|--------------------|--------------------|--------------------|
23+
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
24+
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |

‎cmake/aarch64-ubuntu-20.04.cmake renamed to ‎cmake/aarch64-ubuntu-24.04.cmake

File renamed without changes.

‎cmake/llvm-distribution.cmake

+7-22
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,13 @@ set(LLVM_TOOLCHAIN_TOOLS
126126
${LLVM_BINUTILS_COMPONENTS}
127127
CACHE STRING "")
128128

129-
if (${LLVM_VERSION} STREQUAL "12.0.1")
130-
set(LLD_EXPORTED_TARGETS
131-
lldCommon
132-
lldCore
133-
lldDriver
134-
lldMachO
135-
lldYAML
136-
lldReaderWriter
137-
lldCOFF
138-
lldELF
139-
lldMachO2
140-
lldMinGW
141-
lldWasm)
142-
else()
143-
set(LLD_EXPORTED_TARGETS
144-
lldCommon
145-
lldCOFF
146-
lldELF
147-
lldMachO
148-
lldMinGW
149-
lldWasm)
150-
endif()
129+
set(LLD_EXPORTED_TARGETS
130+
lldCommon
131+
lldCOFF
132+
lldELF
133+
lldMachO
134+
lldMinGW
135+
lldWasm)
151136

152137
set(LLVM_BUILD_UTILS ON CACHE BOOL "")
153138
set(LLVM_INSTALL_UTILS ON CACHE BOOL "")

‎cmake/x86_64-ubuntu-20.04.cmake renamed to ‎cmake/x86_64-ubuntu-24.04.cmake

File renamed without changes.

‎patches/llvm-14-add-lld-install-targets.patch

-77
This file was deleted.

‎patches/llvm-14-add-llvm-name-prefix-to-llc-lli-opt-tools.patch

-25
This file was deleted.

‎patches/llvm-14-force-disable-clang-ast-introspection.patch

-30
This file was deleted.

0 commit comments

Comments
 (0)