diff --git a/.travis.yml b/.travis.yml index 6170609..50b5ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ language: rust rust: - - nightly + - nightly-2018-04-01 cache: cargo: true before_script: - - rustup override set nightly-2018-04-01 - rustup component add rust-src - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - (test -x $HOME/.cargo/bin/xargo || cargo install xargo) diff --git a/Makefile b/Makefile index 0733f23..142db7c 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,9 @@ endif ifeq ($(OS),Windows_NT) - uname := Win32 +uname := Win32 else - uname := $(shell uname) +uname := $(shell uname) endif ifeq ($(uname), Linux) @@ -82,13 +82,13 @@ docker_image ?= blog_os tag ?= 0.1 pwd ?= $(realpath ./) ifeq ($(OS),Windows_NT) - uid ?= 0 - gid ?= 0 - innerpwd ?= /root/blog_os +uid ?= 0 +gid ?= 0 +innerpwd ?= /root/blog_os else - uid ?= $(shell id -u) - gid ?= $(shell id -g) - innerpwd ?= pwd +uid ?= $(shell id -u) +gid ?= $(shell id -g) +innerpwd ?= pwd endif docker_cargo_volume ?= blogos-$(uid)-$(gid)-cargo docker_rustup_volume ?= blogos-$(uid)-$(gid)-rustup diff --git a/build.rs b/build.rs index ee557b4..293f4b8 100644 --- a/build.rs +++ b/build.rs @@ -4,5 +4,6 @@ fn main() { cc::Build::new() .file("src/arch/x86_64/driver/apic/lapic.c") .file("src/arch/x86_64/driver/keyboard/keyboard.c") + .flag("-mcmodel=large") .compile("cobj"); } \ No newline at end of file