MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

prefix: Move clang env to compiler option

Browse Source
This commit is contained in:
Wildan M 2026-09-13 19:28:40 +02:00
parent e3d31c7d84
commit 78f1d0351d
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/prefix.mk
View File

@ -406,7 +406,7 @@ else
@echo "\033[1;36;49mBuilding wasip1-libc-install\033[0m" @echo "\033[1;36;49mBuilding wasip1-libc-install\033[0m"
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
export REDOXER_TOOLCHAIN=$(ROOT)/$(PREFIX)/clang-install $(PREFIX_CONFIG) PATH="$(ROOT)/$(PREFIX)/clang-install/bin:$$PATH" \ 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 $(REPO_BIN) cook host:wasi-libc
cp -r "$(WASIP1_LIBC_TARGET)/stage/usr/". "$@.partial" cp -r "$(WASIP1_LIBC_TARGET)/stage/usr/". "$@.partial"
mkdir -p "$@.partial/share/wasi-sysroot" mkdir -p "$@.partial/share/wasi-sysroot"
@ -453,7 +453,7 @@ else
echo "--sysroot=$(ROOT)/$(PREFIX)/gcc-install" > "$@.partial/bin/$(GNU_TARGET).cfg" echo "--sysroot=$(ROOT)/$(PREFIX)/gcc-install" > "$@.partial/bin/$(GNU_TARGET).cfg"
ln -s clang-21 "$@.partial/bin/$(GNU_TARGET)-clang" ln -s clang-21 "$@.partial/bin/$(GNU_TARGET)-clang"
export PATH="$(ROOT)/$@.partial/bin:$$PATH" $(PREFIX_CONFIG) \ 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 $(REPO_BIN) cook llvm-rt21
cp -r "$(LLVM_RT_TARGET)/stage/usr/". "$@.partial" cp -r "$(LLVM_RT_TARGET)/stage/usr/". "$@.partial"
echo "--sysroot=<CFGDIR>/../$(GNU_TARGET)" > "$@.partial/bin/$(GNU_TARGET).cfg" echo "--sysroot=<CFGDIR>/../$(GNU_TARGET)" > "$@.partial/bin/$(GNU_TARGET).cfg"

1
recipes/core/relibc/recipe.toml
View File

@ -3,6 +3,7 @@ git = "https://gitlab.redox-os.org/redox-os/relibc.git"
[build] [build]
template = "custom" template = "custom"
compiler = "gcc-no-lto"
script = """ script = """
# rustup workaround https://github.com/rust-lang/rustup/issues/988 # rustup workaround https://github.com/rust-lang/rustup/issues/988
if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then

1
recipes/dev/gcc13/recipe.toml
View File

@ -17,6 +17,7 @@ autotools_recursive_regenerate -I"$(realpath ./config)"
[build] [build]
template = "custom" template = "custom"
compiler = "gcc"
dependencies = [ dependencies = [
"libgmp", "libgmp",
"libmpfr", "libmpfr",

1
recipes/dev/llvm-rt21/recipe.toml
View File

@ -3,6 +3,7 @@ same_as = "../llvm21"
[build] [build]
template = "custom" template = "custom"
compiler = "clang"
script = """ script = """
DYNAMIC_INIT DYNAMIC_INIT

1
recipes/dev/rust/recipe.toml
View File

@ -5,6 +5,7 @@ shallow_clone = true
[build] [build]
template = "custom" template = "custom"
compiler = "gcc"
dependencies = [ dependencies = [
"llvm21", "llvm21",
"zlib", "zlib",

1
recipes/dev/wasi-libc/recipe.toml
View File

@ -5,6 +5,7 @@ shallow_clone = true
[build] [build]
template = "custom" template = "custom"
compiler = "clang"
script = """ script = """
cookbook_cmake cookbook_cmake
""" """