Skip to content

21.1.4 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Nov 1, 2025
Merged

21.1.4 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
af44453
21.1.4
star-hengxing Oct 27, 2025
2ba811b
apply CodeRabbit review
star-hengxing Oct 27, 2025
edc4404
Fix build on macos
16bit-ykiko Oct 29, 2025
4fa539b
use llvm21 on macos
star-hengxing Oct 30, 2025
8788861
Fix macos build
16bit-ykiko Oct 30, 2025
b9743e8
Fix
16bit-ykiko Oct 30, 2025
69d02d0
Fix
16bit-ykiko Oct 30, 2025
9e767c6
Enable lto for releasedbg.
16bit-ykiko Oct 30, 2025
ade077d
fix link job
star-hengxing Oct 31, 2025
3937f33
remove LLVM_INCLUDE_TOOLS
star-hengxing Oct 31, 2025
2618381
try CMAKE_JOB_POOL_LINK
star-hengxing Oct 31, 2025
cc1142c
Add swap file.
16bit-ykiko Oct 31, 2025
47aa93c
Turn off lto releasedbg temporarily.
16bit-ykiko Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: linux

on:
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:
Expand All @@ -12,10 +12,10 @@ jobs:
include:
- build_type: debug
lto: "n"
- build_type: release
- build_type: releasedbg
lto: "n"
- build_type: release
lto: "y"
# - build_type: releasedbg
# lto: "y"

concurrency:
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-linux-${{ matrix.build_type }}-${{ matrix.lto }}
Expand All @@ -37,8 +37,26 @@ jobs:
- name: Setup xmake
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.9'
actions-cache-folder: '.xmake-cache'
xmake-version: "2.9.9"
actions-cache-folder: ".xmake-cache"

- name: Increase Swap Space
run: |
echo "===== Initial Status ====="
sudo swapon --show
free -h

echo "===== Creating Swap File ====="
sudo swapoff -a
sudo fallocate -l 16G /mnt/swapfile
sudo chmod 600 /mnt/swapfile
sudo mkswap /mnt/swapfile
sudo swapon /mnt/swapfile

echo "===== Final Status ====="
sudo swapon --show
free -h
df -h

- name: Package
run: |
Expand Down
21 changes: 6 additions & 15 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: macos

on:
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:
Expand All @@ -12,10 +12,10 @@ jobs:
include:
- build_type: debug
lto: "n"
- build_type: release
- build_type: releasedbg
lto: "n"
- build_type: release
lto: "y"
# - build_type: releasedbg
# lto: "y"

concurrency:
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-macos-${{ matrix.build_type }}-${{ matrix.lto }}
Expand All @@ -24,11 +24,7 @@ jobs:
steps:
- name: Setup llvm
run: |
brew install llvm@20

- name: Install lld
run: |
brew install lld@20
brew install llvm@20 lld@20

- name: Setup python
run: |
Expand All @@ -43,14 +39,9 @@ jobs:
run: |
brew install xmake

# - name: Setup xmake
# uses: xmake-io/github-action-setup-xmake@v1
# with:
# xmake-version: '2.9.9'
# actions-cache-folder: '.xmake-cache'

- name: Package
run: |
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
export PATH="/opt/homebrew/opt/llvm@20/bin:/opt/homebrew/opt/lld@20/bin:$PATH"
xmake config --yes --verbose --toolchain=clang --mode=${{ matrix.build_type }} --policies=build.optimization.lto:${{ matrix.lto }}

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ name: windows

on:
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:
runs-on: windows-2025
strategy:
matrix:
include:
- build_type: release
- build_type: releasedbg
runtimes: MD
lto: "n"
- build_type: release
runtimes: MT
lto: "y"
# - build_type: releasedbg
# runtimes: MT
# lto: "y"

concurrency:
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-windows-${{ matrix.build_type }}-${{ matrix.lto }}
Expand All @@ -28,12 +28,12 @@ jobs:
- name: Setup xmake
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.9'
actions-cache-folder: '.xmake-cache'
xmake-version: "2.9.9"
actions-cache-folder: ".xmake-cache"

- name: Package
run: |
xmake config --yes --verbose --runtimes=${{ matrix.runtimes }} --policies=build.optimization.lto:${{ matrix.lto }}
xmake config --yes --verbose --mode=${{ matrix.build_type }} --runtimes=${{ matrix.runtimes }} --policies=build.optimization.lto:${{ matrix.lto }}

- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
70 changes: 39 additions & 31 deletions xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set_policy("compatibility.version", "3.0")
add_requires("llvm", {
system = false,
configs = {
mode = get_config("mode"),
debug = is_mode("debug"),
shared = is_mode("debug") and not is_plat("windows"),
},
Expand All @@ -14,21 +15,20 @@ local sparse_checkout_list = {
"clang",
"clang-tools-extra",
}
-- Enable asan
if is_mode("debug") then
table.insert(sparse_checkout_list, "runtimes")
table.insert(sparse_checkout_list, "compiler-rt")
end

-- TODO: If we need compiler-rt builtin-headers, then we need to enable them.
-- if is_mode("debug") then
-- table.insert(sparse_checkout_list, "runtimes")
-- table.insert(sparse_checkout_list, "compiler-rt")
-- end

package("llvm")
set_urls("https://github.com/llvm/llvm-project/releases/download/llvmorg-$(version)/llvm-project-$(version).src.tar.xz",
"https://github.com/llvm/llvm-project.git", {includes = sparse_checkout_list})
add_urls("https://github.com/llvm/llvm-project.git", {alias = "git", includes = sparse_checkout_list})

add_versions("20.1.5", "a069565cd1c6aee48ee0f36de300635b5781f355d7b3c96a28062d50d575fa3e")
add_versions("git:21.1.4", "llvmorg-21.1.4")
add_versions("git:20.1.5", "llvmorg-20.1.5")

if is_plat("windows") then
add_configs("debug", {description = "Enable debug symbols.", default = false, type = "boolean", readonly = true})
end
add_configs("mode", {description = "Build type", default = "releasedbg", type = "string", values = {"debug", "release", "releasedbg"}})

if is_plat("windows", "mingw") then
add_syslinks("version", "ntdll")
Expand Down Expand Up @@ -75,6 +75,7 @@ package("llvm")
"-DLLVM_INCLUDE_BENCHMARKS=OFF",

-- "-DCLANG_BUILD_TOOLS=OFF",
-- "-DLLVM_INCLUDE_TOOLS=OFF",
"-DLLVM_BUILD_TOOLS=OFF",
"-DLLVM_BUILD_UTILS=OFF",
"-DCLANG_ENABLE_CLANGD=OFF",
Expand All @@ -86,34 +87,41 @@ package("llvm")
"-DLLVM_LINK_LLVM_DYLIB=OFF",
"-DLLVM_ENABLE_RTTI=OFF",

-- "-DLLVM_ENABLE_PROJECTS=clang",
"-DLLVM_PARALLEL_LINK_JOBS=1",

-- Build job and link job together will oom
"-DCMAKE_JOB_POOL_LINK=console",

"-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra",

-- Only build native target
"-DLLVM_TARGETS_TO_BUILD=Native"
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))

local build_type = {
["debug"] = "Debug",
["release"] = "Release",
["releasedbg"] = "RelWithDebInfo",
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (build_type[package:config("mode")]))
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DLLVM_ENABLE_LTO=" .. (package:config("lto") and "ON" or "OFF"))
if package:config("lto") then
if package:is_plat("linux", "macosx") then
table.insert(configs, "-DLLVM_USE_LINKER=lld")
end

if package:config("mode") == "debug" then
table.insert(configs, "-DLLVM_USE_SANITIZER=Address")
end

if package:is_plat("windows") then
table.insert(configs, "-DCMAKE_C_COMPILER=clang-cl")
table.insert(configs, "-DCMAKE_CXX_COMPILER=clang-cl")
end
if package:is_debug() then
table.insert(configs, "-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra")
table.insert(configs, "-DLLVM_ENABLE_RUNTIMES=compiler-rt")
table.insert(configs, "-DLLVM_USE_SANITIZER=Address")
else
table.insert(configs, "-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra")
end

if package:is_plat("macosx") then
table.insert(configs, "-DLLVM_TARGETS_TO_BUILD=AArch64")
elseif package:is_plat("linux") then
table.insert(configs, "-DLLVM_USE_LINKER=lld")
-- table.insert(configs, "-DLLVM_USE_SPLIT_DWARF=ON")
elseif package:is_plat("macosx") then
table.insert(configs, "-DCMAKE_OSX_ARCHITECTURES=arm64")
table.insert(configs, "-DCMAKE_LIBTOOL=/opt/homebrew/opt/llvm@20/bin/llvm-libtool-darwin")
else
table.insert(configs, "-DLLVM_TARGETS_TO_BUILD=X86")
table.insert(configs, "-DLLVM_USE_LINKER=lld")
table.insert(configs, "-DLLVM_ENABLE_LIBCXX=ON")
end

local opt = {}
Expand Down Expand Up @@ -176,7 +184,7 @@ package("llvm")
package:arch(),
package:plat(),
abi,
package:is_debug() and "debug" or "release",
package:config("mode"),
}, "-")

if package:config("lto") then
Expand Down
Loading