From 06c55de97b271859b754da0a0209d5165a718812 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 2 Jun 2019 10:50:41 -0600 Subject: [PATCH] Fix two compile issues --- cookbook | 2 +- mk/config.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 1e812da..c61e25d 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 1e812da7c2771289ab07578a8cc1e610123dd60f +Subproject commit c61e25dbd2897e8f4e9b8f529e6705c9bf05978d diff --git a/mk/config.mk b/mk/config.mk index 5f6eace..e848450 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -27,6 +27,7 @@ endif # Automatic variables ROOT=$(CURDIR) +export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt export RUST_TARGET_PATH=$(ROOT)/kernel/targets export XARGO_HOME=$(ROOT)/build/xargo export XARGO_RUST_SRC=$(ROOT)/rust/src