vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use target-specific folder for relibc source for freestanding build

Browse source
This commit is contained in:
Jeremy Soller 2024-05-11 14:37:47 -06:00
parent 37b1e1fcfa
commit f9823473e2
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -9,7 +9,7 @@
[submodule "rust"] [submodule "rust"]
path = rust path = rust
url = https://gitlab.redox-os.org/redox-os/rust.git url = https://gitlab.redox-os.org/redox-os/rust.git
branch = redox-2023-09-07 branch = redox-2024-05-11
update = none update = none
[submodule "redoxfs"] [submodule "redoxfs"]
path = redoxfs path = redoxfs

2
mk/prefix.mk
View file

@ -185,7 +185,7 @@ else
mv "$@.partial" "$@" mv "$@.partial" "$@"
endif endif
$(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG) $(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
else else

2
rust

@ -1 +1 @@
Subproject commit e9ed31b0540da8c7eae71de353a741294139ae8b Subproject commit baab3498eb8cfe762e7d3009467cf70069871aba

2
rust-toolchain.toml
View file

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "nightly-2023-09-07" channel = "nightly-2024-05-11"
components = ["rust-src"] components = ["rust-src"]