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

Merge branch 'clang-redoxer' into 'master'

Browse Source 
Update redoxer, add CFGDIR to clang sysroot

See merge request redox-os/redox!2348
This commit is contained in:
Jeremy Soller 2026-09-12 07:00:48 -06:00
commit b169529ebf
2 changed files with 2 additions and 2 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/redox-os/redoxer.git#af96492e69e0563c9d42847ec4f5a118e8ec6544"
source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#f50e0d7f490b60110ee6494a06d9b2f9981f8a5a"
dependencies = [
"anyhow",
"dirs",

2
mk/prefix.mk
View File

@ -456,7 +456,7 @@ else
COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(HOST_TARGET) REDOXER_USE_CLANG=1 && \
$(REPO_BIN) cook llvm-rt21
cp -r "$(LLVM_RT_TARGET)/stage/usr/". "$@.partial"
echo "--sysroot=../$(GNU_TARGET)" > "$@.partial/bin/$(GNU_TARGET).cfg"
echo "--sysroot=<CFGDIR>/../$(GNU_TARGET)" > "$@.partial/bin/$(GNU_TARGET).cfg"
mv "$@.partial" "$@"
# no longer needed, delete build files to save disk space
rm -rf $(CLANG_TARGET) $(LLD_TARGET) $(LLVM_RT_TARGET)