From f6346e8e15c114cf28892324f7dfe78607ef7d6b Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Wed, 10 Oct 2018 18:36:47 +0200
Subject: [PATCH] Some changes

---
 build.sh         | 2 +-
 xargo/Xargo.toml | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 3d0e081f385..3f65c9e97ae 100755
--- a/build.sh
+++ b/build.sh
@@ -76,7 +76,7 @@ time $RUSTC target/libcore/src/libcore/lib.rs --crate-type lib --crate-name core
 pushd xargo
 rm -r ~/.xargo/HOST || true
 export XARGO_RUST_SRC=$(pwd)'/../target/libcore/src'
-time xargo build --color always
+time SHOULD_CODEGEN=1 xargo build --color always
 rm -r target/
 popd
 
diff --git a/xargo/Xargo.toml b/xargo/Xargo.toml
index 51f6c78ea2b..57feaa90008 100644
--- a/xargo/Xargo.toml
+++ b/xargo/Xargo.toml
@@ -1,9 +1,7 @@
 [dependencies]
 core = {}
-
-# Disabled due to bug in current cranelift version, fixed in master
-#alloc = {}
-#alloc_system = {}
+alloc = {}
+alloc_system = {}
 
 # Disabled due to missing support for many things (intrinsics, etc) in rustc_codegen_cranelift
 #std = {features = ["force_alloc_system"]}