From 580287392bb9d43a65f8fadf98898e1e5dc0ddef Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 15 Sep 2018 07:25:49 -0600 Subject: [PATCH] - Do not copy relibc before building - Remove debug section from live kernel as well --- mk/filesystem.mk | 4 +++- mk/kernel.mk | 2 ++ mk/prefix.mk | 4 +--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 9281e9f..fa9d437 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -8,7 +8,9 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- $@.partial build/filesystem/ sleep 2 pgrep redoxfs - cp filesystem.toml build/bootloader build/kernel build/filesystem/ + cp $< build/filesystem/filesystem.toml + cp build/bootloader build/filesystem/bootloader + cp build/kernel build/filesystem/kernel export PATH="$(PREFIX_PATH):$$PATH" && \ cargo run --manifest-path installer/Cargo.toml --release -- $(INSTALLER_FLAGS) -c $< build/filesystem/ chown -R 0:0 build/filesystem diff --git a/mk/kernel.mk b/mk/kernel.mk index d830042..d5fb7f0 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -16,6 +16,8 @@ build/kernel: kernel/linkers/$(ARCH).ld build/libkernel.a build/kernel_live: kernel/linkers/$(ARCH).ld build/libkernel_live.a build/live.o $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_live.a build/live.o + objcopy --only-keep-debug $@ $@.sym + objcopy --strip-debug $@ build/live.o: build/filesystem.bin #TODO: More general use of $(ARCH) diff --git a/mk/prefix.mk b/mk/prefix.mk index c71175e..c6d3d14 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -53,11 +53,9 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding-install rm -rf "$(PREFIX)/relibc-build" - cp -r relibc "$(PREFIX)/relibc-build" - cd $(PREFIX)/relibc-build && \ + cd relibc && \ export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \ rustup target add "$(TARGET)" && \ - make clean && \ make all && \ make DESTDIR="$@/usr" install touch "$@"