Merge branch 'llvm-boostrap-link' into 'master'

Reduce llvm link during bootstrap

See merge request redox-os/redox!1901
This commit is contained in:
Jeremy Soller 2026-02-12 19:50:31 -07:00
commit 805cf349cc
3 changed files with 18 additions and 2 deletions

View File

@ -6,7 +6,7 @@ patches = [
[build]
template = "custom"
script = """
DYNAMIC_INIT
DYNAMIC_STATIC_INIT
rsync -av --delete "${COOKBOOK_SOURCE}/" ./
${COOKBOOK_MAKE}
${COOKBOOK_MAKE} install DESTDIR="${COOKBOOK_STAGE}" prefix="/usr"

View File

@ -45,6 +45,13 @@ COOKBOOK_CMAKE_FLAGS+=(
-DUNIX=1
)
if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then
# avoid linking as much as possible during bootstrapping
COOKBOOK_CMAKE_FLAGS+=(
-DLLVM_USE_STATIC_ZSTD=On
)
fi
COOKBOOK_SOURCE="$COOKBOOK_SOURCE/lld"
cookbook_cmake

View File

@ -7,7 +7,7 @@ shallow_clone = true
[build]
template = "custom"
dependencies = [
"zlib",
"zstd",
"libxml2",
]
dev-dependencies = [
@ -39,6 +39,7 @@ COOKBOOK_CMAKE_FLAGS+=(
-DLLVM_TOOL_LLVM_COV_BUILD=On
-DLLVM_TOOL_LLVM_PROFDATA_BUILD=On
-DLLVM_TARGETS_TO_BUILD="$LLVM_TARGETS_TO_BUILD"
-DLLVM_ENABLE_ZLIB=Off
# the rest of options that shared to clang
-DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath "${COOKBOOK_RECIPE}/native.cmake")"
@ -59,6 +60,14 @@ COOKBOOK_CMAKE_FLAGS+=(
-DUNIX=1
)
if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then
# avoid linking as much as possible during bootstrapping
COOKBOOK_CMAKE_FLAGS+=(
-DLLVM_ENABLE_LIBXML2=Off
-DLLVM_USE_STATIC_ZSTD=On
)
fi
COOKBOOK_SOURCE="$COOKBOOK_SOURCE/llvm"
cookbook_cmake
"""