Revert "Compile with opt-level 3, lto"

This reverts commit 68b3315673.
This commit is contained in:
Jeremy Soller 2017-01-09 21:51:41 -07:00
parent 68b3315673
commit e519d215d8
4 changed files with 4 additions and 16 deletions

View file

@ -34,15 +34,3 @@ members = [
"schemes/udpd", "schemes/udpd",
"syscall" "syscall"
] ]
[profile.dev]
debug = true
debug-assertions = true
lto = false
opt-level = 0
[profile.release]
debug = false
debug-assertions = false
lto = true
opt-level = 3

View file

@ -21,7 +21,7 @@ BUILD=build/userspace
RUSTC=./rustc.sh RUSTC=./rustc.sh
RUSTDOC=./rustdoc.sh RUSTDOC=./rustdoc.sh
CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
CARGOFLAGS=--target $(TARGET) --release -- CARGOFLAGS=--target $(TARGET) --release -- -C codegen-units=`nproc`
# Per host variables # Per host variables
UNAME := $(shell uname) UNAME := $(shell uname)

View file

@ -1,6 +1,6 @@
$(KBUILD)/libcollections.rlib: rust/src/libcollections/Cargo.toml rust/src/libcollections/** $(KBUILD)/libcollections.rlib: rust/src/libcollections/Cargo.toml rust/src/libcollections/**
mkdir -p $(KBUILD) mkdir -p $(KBUILD)
$(KCARGO) rustc --manifest-path $< $(KCARGOFLAGS) -o $@ $(KCARGO) rustc --verbose --manifest-path $< $(KCARGOFLAGS) -o $@
cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD) cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD)
$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs $(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs

View file

@ -28,12 +28,12 @@ include mk/userspace/userutils.mk
$(BUILD)/libstd.rlib: rust/src/libstd/Cargo.toml rust/src/libstd/** $(BUILD)/libstd.rlib: rust/src/libstd/Cargo.toml rust/src/libstd/**
mkdir -p $(BUILD) mkdir -p $(BUILD)
$(CARGO) rustc --manifest-path $< --features "panic-unwind" $(CARGOFLAGS) -L native=libc-artifacts/usr/lib -o $@ $(CARGO) rustc --verbose --manifest-path $< --features "panic-unwind" $(CARGOFLAGS) -L native=libc-artifacts/usr/lib -o $@
cp rust/src/target/$(TARGET)/release/deps/*.rlib $(BUILD) cp rust/src/target/$(TARGET)/release/deps/*.rlib $(BUILD)
$(BUILD)/libtest.rlib: rust/src/libtest/Cargo.toml rust/src/libtest/** $(BUILD)/libstd.rlib $(BUILD)/libtest.rlib: rust/src/libtest/Cargo.toml rust/src/libtest/** $(BUILD)/libstd.rlib
mkdir -p $(BUILD) mkdir -p $(BUILD)
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -L native=libc-artifacts/usr/lib -o $@ $(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -L native=libc-artifacts/usr/lib -o $@
cp rust/src/target/$(TARGET)/release/deps/*.rlib $(BUILD) cp rust/src/target/$(TARGET)/release/deps/*.rlib $(BUILD)
filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib