Fix link error when building on docker.

master
WangRunji 7 years ago
parent c218d834f4
commit 7b39e4ce66

@ -1,13 +1,12 @@
language: rust language: rust
rust: rust:
- nightly - nightly-2018-04-01
cache: cache:
cargo: true cargo: true
before_script: before_script:
- rustup override set nightly-2018-04-01
- rustup component add rust-src - rustup component add rust-src
- (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
- (test -x $HOME/.cargo/bin/xargo || cargo install xargo) - (test -x $HOME/.cargo/bin/xargo || cargo install xargo)

@ -26,9 +26,9 @@ endif
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
uname := Win32 uname := Win32
else else
uname := $(shell uname) uname := $(shell uname)
endif endif
ifeq ($(uname), Linux) ifeq ($(uname), Linux)
@ -82,13 +82,13 @@ docker_image ?= blog_os
tag ?= 0.1 tag ?= 0.1
pwd ?= $(realpath ./) pwd ?= $(realpath ./)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
uid ?= 0 uid ?= 0
gid ?= 0 gid ?= 0
innerpwd ?= /root/blog_os innerpwd ?= /root/blog_os
else else
uid ?= $(shell id -u) uid ?= $(shell id -u)
gid ?= $(shell id -g) gid ?= $(shell id -g)
innerpwd ?= pwd innerpwd ?= pwd
endif endif
docker_cargo_volume ?= blogos-$(uid)-$(gid)-cargo docker_cargo_volume ?= blogos-$(uid)-$(gid)-cargo
docker_rustup_volume ?= blogos-$(uid)-$(gid)-rustup docker_rustup_volume ?= blogos-$(uid)-$(gid)-rustup

@ -4,5 +4,6 @@ fn main() {
cc::Build::new() cc::Build::new()
.file("src/arch/x86_64/driver/apic/lapic.c") .file("src/arch/x86_64/driver/apic/lapic.c")
.file("src/arch/x86_64/driver/keyboard/keyboard.c") .file("src/arch/x86_64/driver/keyboard/keyboard.c")
.flag("-mcmodel=large")
.compile("cobj"); .compile("cobj");
} }
Loading…
Cancel
Save