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

Fix build, remove cfg(redox)

Browse source
This commit is contained in:
Jeremy Soller 2016-11-09 17:00:48 -07:00
parent 01d2c8d0f2
commit fb739faece
6 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -284,6 +284,10 @@ $(BUILD)/libstd.rlib: libstd/Cargo.toml libstd/src/** $(BUILD)/libcore.rlib $(BU
$(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@
cp libstd/target/$(TARGET)/release/deps/*.rlib $(BUILD)
#$(BUILD)/libstd.rlib: libstd_real/Cargo.toml rust/src/libstd/** $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib $(BUILD)/librustc_unicode.rlib $(BUILD)/libcollections.rlib $(BUILD)/librand.rlib $(BUILD)/libopenlibm.a
# $(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@
# cp libstd_real/target/$(TARGET)/release/deps/*.rlib $(BUILD)
initfs/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@

5
drivers/pcid/Cargo.toml
View file

@ -4,5 +4,8 @@ version = "0.1.0"
[dependencies]
redox_syscall = { path = "../../syscall/" }
rustc-serialize = "0.3"
rustc-serialize = { git = "https://github.com/jackpot51/rustc-serialize.git" }
toml = "*"
[replace]
"rustc-serialize:0.3.20" = { git = "https://github.com/jackpot51/rustc-serialize.git" }

2
krustc.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
RUST_BACKTRACE=1 rustc -L build/kernel --cfg redox $*
RUST_BACKTRACE=1 rustc -L build/kernel $*

2
krustdoc.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
RUST_BACKTRACE=1 rustdoc -L build/kernel --cfg redox $*
RUST_BACKTRACE=1 rustdoc -L build/kernel $*

2
rustc.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
RUST_BACKTRACE=1 rustc -L build/userspace --cfg redox $*
RUST_BACKTRACE=1 rustc -L build/userspace $*

2
rustdoc.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
RUST_BACKTRACE=1 rustdoc -L build/userspace --cfg redox $*
RUST_BACKTRACE=1 rustdoc -L build/userspace $*