diff --git a/.travis.yml b/.travis.yml
index 504bf3e..0f450cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,16 +20,13 @@ env:
     - ARCH="riscv32"
     - ARCH="x86_64"
 
-before_install:
-  - if [ $ARCH = riscv32 ]; then
-      docker pull wangrunji0408/riscv-rust;
-    fi
-
 before_script:
-  - 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)
-  - cargo install-update -a
+  - if [ $ARCH = x86_64 ]; then
+    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) &&
+    cargo install-update -a;
+    fi
 
 script:
   - if [ $ARCH = riscv32 ]; then
diff --git a/kernel/x86_64-blog_os.json b/kernel/x86_64-blog_os.json
index d2fa22e..023acb7 100644
--- a/kernel/x86_64-blog_os.json
+++ b/kernel/x86_64-blog_os.json
@@ -1,7 +1,7 @@
 {
   "llvm-target": "x86_64-unknown-none",
   "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
-  "linker-flavor": "gcc",
+  "linker-flavor": "ld.lld",
   "target-endian": "little",
   "target-pointer-width": "64",
   "target-c-int-width": "32",