mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
prefix: Move clang env to compiler option
This commit is contained in:
parent
e3d31c7d84
commit
78f1d0351d
@ -406,7 +406,7 @@ else
|
||||
@echo "\033[1;36;49mBuilding wasip1-libc-install\033[0m"
|
||||
rm -rf "$@.partial" "$@"
|
||||
export REDOXER_TOOLCHAIN=$(ROOT)/$(PREFIX)/clang-install $(PREFIX_CONFIG) PATH="$(ROOT)/$(PREFIX)/clang-install/bin:$$PATH" \
|
||||
REDOXER_USE_CLANG=1 COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=wasm32-wasip1 COOKBOOK_CROSS_GNU_TARGET=wasm32-wasip1 && \
|
||||
COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=wasm32-wasip1 COOKBOOK_CROSS_GNU_TARGET=wasm32-wasip1 && \
|
||||
$(REPO_BIN) cook host:wasi-libc
|
||||
cp -r "$(WASIP1_LIBC_TARGET)/stage/usr/". "$@.partial"
|
||||
mkdir -p "$@.partial/share/wasi-sysroot"
|
||||
@ -453,7 +453,7 @@ else
|
||||
echo "--sysroot=$(ROOT)/$(PREFIX)/gcc-install" > "$@.partial/bin/$(GNU_TARGET).cfg"
|
||||
ln -s clang-21 "$@.partial/bin/$(GNU_TARGET)-clang"
|
||||
export PATH="$(ROOT)/$@.partial/bin:$$PATH" $(PREFIX_CONFIG) \
|
||||
COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(HOST_TARGET) REDOXER_USE_CLANG=1 && \
|
||||
COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(HOST_TARGET) && \
|
||||
$(REPO_BIN) cook llvm-rt21
|
||||
cp -r "$(LLVM_RT_TARGET)/stage/usr/". "$@.partial"
|
||||
echo "--sysroot=<CFGDIR>/../$(GNU_TARGET)" > "$@.partial/bin/$(GNU_TARGET).cfg"
|
||||
|
||||
@ -3,6 +3,7 @@ git = "https://gitlab.redox-os.org/redox-os/relibc.git"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
compiler = "gcc-no-lto"
|
||||
script = """
|
||||
# rustup workaround https://github.com/rust-lang/rustup/issues/988
|
||||
if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then
|
||||
|
||||
@ -17,6 +17,7 @@ autotools_recursive_regenerate -I"$(realpath ./config)"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
compiler = "gcc"
|
||||
dependencies = [
|
||||
"libgmp",
|
||||
"libmpfr",
|
||||
|
||||
@ -3,6 +3,7 @@ same_as = "../llvm21"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
compiler = "clang"
|
||||
script = """
|
||||
DYNAMIC_INIT
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@ shallow_clone = true
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
compiler = "gcc"
|
||||
dependencies = [
|
||||
"llvm21",
|
||||
"zlib",
|
||||
|
||||
@ -5,6 +5,7 @@ shallow_clone = true
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
compiler = "clang"
|
||||
script = """
|
||||
cookbook_cmake
|
||||
"""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user