MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-01 00:58:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use real relibc

Browse Source
This commit is contained in:
Wildan M 2026-04-14 19:56:28 +07:00
parent df5e823c3d
commit b11968a1f3
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -918,7 +918,7 @@ dependencies = [
[[package]]
name = "redoxer"
version = "0.2.63"
source = "git+https://gitlab.redox-os.org/willnode/redoxer.git?branch=linux#c566c012cf073a990bdb2a89bdfe181af808aea6"
source = "git+https://gitlab.redox-os.org/willnode/redoxer.git?branch=linux#908336f2bf893d026e391b8972f271a78e4e27c2"
dependencies = [
"anyhow",
"dirs",

2
mk/config.mk
View File

@ -161,7 +161,7 @@ endif
## Userspace variables
ifeq ($(OPERATING_SYSTEM),linux)
export TARGET=$(ARCH)-unknown-linux-musl
export TARGET=$(ARCH)-unknown-linux-relibc
export GNU_TARGET=$(ARCH)-linux-relibc
export USE_RUST_LIBM=1
else ifeq ($(ARCH),riscv64gc)

10
recipes/dev/rust/config-cross-linux.toml
View File

@ -5,7 +5,7 @@ link-shared = true
[build]
host = ["TARGET"]
target = ["TARGET", "COOKBOOK_TARGET"]
target = ["TARGET", "x86_64-unknown-linux-relibc", "aarch64-unknown-linux-relibc"]
cargo-native-static = true
submodules = false
docs = false
@ -21,14 +21,6 @@ sysconfdir = "etc"
backtrace = false
codegen-tests = false
[target.COOKBOOK_TARGET]
cc = "COOKBOOK_GNU_TARGET-gcc"
cxx = "COOKBOOK_GNU_TARGET-g++"
ar = "COOKBOOK_GNU_TARGET-ar"
linker = "COOKBOOK_GNU_TARGET-gcc"
crt-static = false
llvm-config = "COOKBOOK_SYSROOT/bin/llvm-config"
[target.aarch64-unknown-linux-gnu]
llvm-config = "COOKBOOK_TOOLCHAIN/bin/llvm-config"

5
recipes/libs/libstdcxx-v3/recipe.toml
View File

@ -15,7 +15,10 @@ COOKBOOK_CONFIGURE_FLAGS+=(
if [ "${TARGET}" = "riscv64gc-unknown-redox" ]; then
COOKBOOK_CONFIGURE_FLAGS+=( --without-libstdcxx-zoneinfo )
fi
if [ "${TARGET}" = "x86_64-unknown-linux-musl" ]; then
if [ "${TARGET}" = "x86_64-unknown-linux-relibc" ]; then
COOKBOOK_CONFIGURE_FLAGS+=( --without-libstdcxx-zoneinfo )
fi
if [ "${TARGET}" = "aarch64-unknown-linux-relibc" ]; then
COOKBOOK_CONFIGURE_FLAGS+=( --without-libstdcxx-zoneinfo )
fi