summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Soller <jeremy@system76.com>2021-06-18 13:54:40 -0600
committerJeremy Soller <jeremy@system76.com>2021-06-18 13:54:40 -0600
commitb35a91576dd377a792eabbdebb747650c3add15b (patch)
tree74d24375547e90cfe0383b87f9732022b9215831
parent848c3f9ec16e0b036e912a0992854eb8a5780aca (diff)
Workarounds for compilation issues
-rw-r--r--mk/prefix.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 4c1bfb7..a2986aa 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -21,6 +21,7 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/rust-install
rm -rf "$@.partial/$(TARGET)/include/"*
cp -r "$(PREFIX)/rust-install/$(TARGET)/include/c++" "$@.partial/$(TARGET)/include/c++"
cp -r "$(PREFIX)/rust-install/lib/rustlib/$(HOST_TARGET)/lib/" "$@.partial/lib/rustlib/$(HOST_TARGET)/"
+ rm -rf $@.partial/lib/rustlib/src
mkdir $@.partial/lib/rustlib/src
ln -s $(ROOT)/rust $@.partial/lib/rustlib/src
cd "$<" && \
@@ -44,7 +45,8 @@ ifeq ($(PREFIX_BINARY),1)
$(PREFIX)/rust-install.tar.gz:
mkdir -p "$(@D)"
- wget -O $@.partial "https://static.redox-os.org/toolchain/$(TARGET)/rust-install.tar.gz"
+ #TODO: figure out why rust-install.tar.gz is missing /lib/rustlib/$(HOST_TARGET)/lib
+ wget -O $@.partial "https://static.redox-os.org/toolchain/$(TARGET)/relibc-install.tar.gz"
mv $@.partial $@
$(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz