michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Allow users to use latest nightly compiler without manually setting environment variable (#381)

Browse Source 
* Workaround for latest rust compiler

* Remove unnecessary travis environment variable
This commit is contained in:
Rob Gries
2018-01-02 12:11:38 -05:00
committed by Philipp Oppermann
parent 3523fdfbb5
commit b188e8a617
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -24,4 +24,4 @@ addons:
- nasm - nasm
script: script:
- make RUST_TARGET_PATH=`pwd` - make

2
Makefile
View File

@@ -74,7 +74,7 @@ $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
@ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os) @ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)
cargo: cargo:
@xargo build --target $(target) @RUST_TARGET_PATH="$(shell pwd)" xargo build --target $(target)
# compile assembly files # compile assembly files
build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm