From 907a162d5ba5a99e6137110abf1ef33b3aef19d5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 7 Jun 2019 15:59:45 -0600 Subject: [PATCH] Fix build with new compiler-builtins, update kernel --- kernel | 2 +- mk/config.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel b/kernel index fcd8ce7..1be77c2 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit fcd8ce7e1b6e3c6fe14b0ce8ba23c0792dbd3610 +Subproject commit 1be77c2ab4a011b458b6df3501451a4fcd626d76 diff --git a/mk/config.mk b/mk/config.mk index 423b334..1733ca1 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