This repository was archived by the owner on Apr 6, 2020. It is now read-only.
Use xargo to build #62
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2334b29 to
d0c3a0e
Compare
steveklabnik
added a commit
to intermezzOS/book
that referenced
this pull request
Sep 25, 2016
Paired iwth intermezzOS/kernel#62, this now uses xargo rather than our own fork of libcore.
steveklabnik
added a commit
to intermezzOS/book
that referenced
this pull request
Sep 25, 2016
Paired with intermezzOS/kernel#62, this now uses xargo rather than our own fork of libcore.
ashleygwilliams
suggested changes
Sep 25, 2016
| @@ -1,8 +1,13 @@ | |||
| sudo: required | |||
| dist: trusty | |||
There was a problem hiding this comment.
you might make a comment in this PR about the changes that are happening here
| "os": "intermezzos", | ||
| "target-endian": "little", | ||
| "target-pointer-width": "64", | ||
| "features": "-mmx,-fxsr,-sse,-sse2,+soft-float", |
There was a problem hiding this comment.
mention this in the PR the diff makes it impossible to see
| "raw-cpuid 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| "serde_json 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| ] | ||
|
|
||
| [metadata] |
| @@ -31,7 +23,7 @@ target/boot.o: src/asm/boot.asm | |||
| nasm -f elf64 src/asm/boot.asm -o target/boot.o | |||
|
|
|||
| target/kernel.bin: $(o_files) src/asm/linker.ld cargo | |||
| ld -n -o target/kernel.bin -T src/asm/linker.ld $(o_files) $(libintermezzos_a) | |||
| ld -n -o target/kernel.bin -T src/asm/linker.ld --gc-sections $(o_files) $(libintermezzos_a) | |||
| ```bash | ||
| $ rustup override set nightly-2016-05-26 | ||
| ``` | ||
| If you don’t have Rust installed, you should use [rustup](https://rustup.rs/) |
There was a problem hiding this comment.
"If you don’t have Rust installed, and probably even if you do,"
steveklabnik
added a commit
to intermezzOS/book
that referenced
this pull request
Sep 25, 2016
Paired with intermezzOS/kernel#62, this now uses xargo rather than our own fork of libcore.
This is much much nicer than maintaining a port of libcore. Thanks @japaric! ❤️ This also means that the "hello cargo" chapter of the book will need to be redone. I also re-organized the .json file to be in alphabetical order and fixed some indentation issues. I also added +soft-float, which is needed since we no longer have the no-float patch. I also had to update the x86 dependency to work with current nightly. There were some updates to the travis.yml: removing the specific VM version of Trusty, which meant installing grub-common. This also means that we are no longer tied to a specific Rust version. Finally, --gc-sections was needed. We used to have a no-float patch for libcore when we compiled it custom, but xargo doesn't know how to do that. --gc-sections will get rid of the unused calls instead.
ashleygwilliams
approved these changes
Sep 25, 2016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is much much nicer than maintaining a port of libcore. Thanks
@japaric! ❤️
This also means that the "hello cargo" chapter of the book will need to
be redone.
r? @ashleygwilliams