From b188e8a617f7fd4951ce17f21718746df685812b Mon Sep 17 00:00:00 2001
From: Rob Gries <robert.w.gries@gmail.com>
Date: Tue, 2 Jan 2018 12:11:38 -0500
Subject: [PATCH] Allow users to use latest nightly compiler without manually
 setting environment variable (#381)

* Workaround for latest rust compiler

* Remove unnecessary travis environment variable
---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b88b57bc..85cecf4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,4 @@ addons:
       - nasm
 
 script:
-  - make RUST_TARGET_PATH=`pwd`
+  - make
diff --git a/Makefile b/Makefile
index baae27fb..31b5e12c 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
 cargo:
-	@xargo build --target $(target)
+	@RUST_TARGET_PATH="$(shell pwd)" xargo build --target $(target)
 
 # compile assembly files
 build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm