semios/semios-packages
1
0
Fork 1
Code Issues 3 Pull Requests 22 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: llvm build configuration has invalid fields' (#141) from sisungo/semios-packages:llvmfix into master

Browse Source 
Reviewed-on: #141
This commit was merged in pull request #141.
This commit is contained in:
sisungo
2026-08-09 14:22:52 +08:00
parent 2f7053488b e7d77b63b3
commit ea440a2465
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/llvm-project/pkgbuild.py
+3 -4
View File
@@ -131,6 +131,7 @@ def build_clang():
"-DCLANG_DEFAULT_CXX_STDLIB=libc++", "-DCLANG_DEFAULT_CXX_STDLIB=libc++",
"-DCLANG_DEFAULT_RTLIB=compiler-rt", "-DCLANG_DEFAULT_RTLIB=compiler-rt",
"-DLLVM_INCLUDE_TESTS=OFF", "-DLLVM_INCLUDE_TESTS=OFF",
f"-DC_INCLUDE_DIRS=/lib/{arch.get_target()}/include",
] ]
cmake("clang", import_llvm() + options) cmake("clang", import_llvm() + options)
@@ -144,7 +145,7 @@ def build_polly():
cmake("polly", import_llvm()) cmake("polly", import_llvm())
def build_runtimes(): def build_runtimes():
cflags = f"-isystem /lib/{arch.get_target()}/include -L/lib/{arch.get_target()} -B/lib/{arch.get_target()} -rtlib=compiler-rt" os.makedirs("../_build_runtimes", exist_ok=True)
shutil.rmtree("../_build_runtimes") shutil.rmtree("../_build_runtimes")
options = [ options = [
# Configure runtimes # Configure runtimes
@@ -188,6 +189,7 @@ dep("semi-libc @same-arch")
dep("libunwind @same-arch") dep("libunwind @same-arch")
dep("libcxx @same-arch") dep("libcxx @same-arch")
dep("libcxxabi @same-arch") dep("libcxxabi @same-arch")
dep("libffi @same-arch")
on_pack(lambda composer: auto_pack_glob(composer, ["lib/*.so*"])) on_pack(lambda composer: auto_pack_glob(composer, ["lib/*.so*"]))
package("libllvm-dev") package("libllvm-dev")
@@ -250,9 +252,6 @@ def pack_clang(composer):
lrtlib = rtlib.replace(f"-{larch}", "") lrtlib = rtlib.replace(f"-{larch}", "")
composer.addfile(f"{linuxrtdir}/{rtlib}", f"{localrtdir}/{lrtlib}") composer.addfile(f"{linuxrtdir}/{rtlib}", f"{localrtdir}/{lrtlib}")
# Add symlink to system directories
os.symlink(f"/lib/{arch.get_target()}/include", f"{composer.workdir}/bundle/include")
# Add configuration # Add configuration
clang_cfg = f"-L/lib/{arch.get_target()}\n-B/lib/{arch.get_target()}\n-rtlib=compiler-rt\n" clang_cfg = f"-L/lib/{arch.get_target()}\n-B/lib/{arch.get_target()}\n-rtlib=compiler-rt\n"
clangxx_cfg = f"-stdlib=libc++\n{clang_cfg}" clangxx_cfg = f"-stdlib=libc++\n{clang_cfg}"