MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'rustdoc' into 'master'

Browse Source 
Fix rust compilation, add rustdoc

See merge request redox-os/redox!1937
This commit is contained in:
Jeremy Soller 2026-02-23 20:33:14 -07:00
commit c2dc58336b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/prefix.mk
View File

@ -385,10 +385,11 @@ else
export PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \ export PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \
$(PREFIX_CONFIG) COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) && \ $(PREFIX_CONFIG) COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) && \
./target/release/repo cook host:llvm21 host:clang21 host:lld21 ./target/release/repo cook host:llvm21 host:clang21 host:lld21
# skipping dev, llvm libraries is already in rust if building # llvm libraries is already in rust if building
ifeq ($(PREFIX_USE_UPSTREAM_RUST_COMPILER),1) ifeq ($(PREFIX_USE_UPSTREAM_RUST_COMPILER),1)
cp -r "$(LLVM_TARGET)/stage/usr/". "$@.partial" cp -r "$(LLVM_TARGET)/stage/usr/". "$@.partial"
endif endif
cp -r "$(LLVM_TARGET)/stage.dev/usr/". "$@.partial"
cp -r "$(LLVM_TARGET)/stage.runtime/usr/". "$@.partial" cp -r "$(LLVM_TARGET)/stage.runtime/usr/". "$@.partial"
cp -r "$(CLANG_TARGET)/stage/usr/". "$@.partial" cp -r "$(CLANG_TARGET)/stage/usr/". "$@.partial"
cp -r "$(LLD_TARGET)/stage/usr/". "$@.partial" cp -r "$(LLD_TARGET)/stage/usr/". "$@.partial"

2
recipes/dev/rust/config-bootstrap.toml
View File

@ -10,7 +10,7 @@ target = ["TARGET", "i586-unknown-redox", "x86_64-unknown-redox", "aarch64-unkno
cargo-native-static = true cargo-native-static = true
submodules = false submodules = false
docs = false docs = false
tools = ["cargo", "clippy", "rustfmt", "src"] tools = ["cargo", "clippy", "rustdoc", "rustfmt", "src"]
extended = true extended = true
verbose = 1 verbose = 1

3
recipes/dev/rust/config.toml
View File

@ -8,9 +8,8 @@ experimental-targets = ""
host = ["x86_64-unknown-redox"] host = ["x86_64-unknown-redox"]
target = ["x86_64-unknown-redox"] target = ["x86_64-unknown-redox"]
submodules = false submodules = false
# TODO: enable rustdoc and others
docs = false docs = false
tools = ["cargo", "clippy", "rustfmt", "src"] tools = ["cargo", "clippy", "rustdoc", "rustfmt", "src"]
extended = true extended = true
verbose = 1 verbose = 1

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

@ -37,14 +37,14 @@ export CARGO_TARGET_X86_64_UNKNOWN_REDOX_RUSTFLAGS="\
cat "${COOKBOOK_ROOT}/bin/x86_64-unknown-redox-llvm-config" > "${COOKBOOK_SYSROOT}/bin/llvm-config" cat "${COOKBOOK_ROOT}/bin/x86_64-unknown-redox-llvm-config" > "${COOKBOOK_SYSROOT}/bin/llvm-config"
# Linker flags for stage1 compiler (host -> host) # Linker flags for stage1 compiler (host -> host)
export RUSTFLAGS_BOOTSTRAP="\ export RUSTFLAGS_BOOTSTRAP="\
-Clink-args=-L${COOKBOOK_TOOLCHAIN}/lib \ -Clink-args=-L${COOKBOOK_HOST_SYSROOT}/lib \
-Clink-args=-Wl,-rpath-link,${COOKBOOK_TOOLCHAIN}/lib" -Clink-args=-Wl,-rpath-link,${COOKBOOK_HOST_SYSROOT}/lib"
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="${RUSTFLAGS_BOOTSTRAP}" export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="${RUSTFLAGS_BOOTSTRAP}"
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="${RUSTFLAGS_BOOTSTRAP}" export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="${RUSTFLAGS_BOOTSTRAP}"
cat ${COOKBOOK_RECIPE}/config.toml > config.toml cat ${COOKBOOK_RECIPE}/config.toml > config.toml
sed -i "s|COOKBOOK_SYSROOT|${COOKBOOK_SYSROOT}|g" config.toml sed -i "s|COOKBOOK_SYSROOT|${COOKBOOK_SYSROOT}|g" config.toml
sed -i "s|COOKBOOK_TOOLCHAIN|${COOKBOOK_TOOLCHAIN}|g" config.toml sed -i "s|COOKBOOK_TOOLCHAIN|${COOKBOOK_HOST_SYSROOT}|g" config.toml
fi fi