bootstrap.sh

@@ -231,9 +231,7 @@ ubuntu()
 		git \
 		gperf \
 		libc6-dev-i386 \
-		libexpat-dev \
 		libfuse-dev \
-		libgmp-dev \
 		libhtml-parser-perl \
 		libpng-dev \
 		libtool \

ci.toml

@@ -17,7 +17,7 @@ binutils = {}
 bootloader = {}
 ca-certificates = {}
 cairo = {}
-#cairodemo = {} # multiple definition of __rust_alloc
+cairodemo = {}
 #cargo = {} # curl-config not found
 cleye = {}
 cmatrix = {}
@@ -75,7 +75,6 @@ keyboard-sfx = {}
 lci = {}
 libc-bench = {}
 libffi = {}
-libgmp = {}
 libiconv = {}
 libjpeg = {}
 libogg = {}
@@ -165,7 +164,7 @@ sdl2_ttf = {}
 sdl_gfx = {}
 sdl_image = {}
 sdl_mixer = {}
-#sdl-player = {} # wctype_t
+sdl-player = {}
 #sdl_ttf = {} # configure patch needs to be updated
 sed = {}
 #servo = {} # some more crates to port

cookbook

@@ -1 +1 @@
-Subproject commit f11560d9785f76dbd80167b0e6ca02eeaca82ac4
+Subproject commit 6e25f3485bdc4e3f3a62f83c6eaec5ac3ef25cab

kernel

@@ -1 +1 @@
-Subproject commit 9c3cf84453f95d597823f3b0d1512b48160c2ea8
+Subproject commit 6039026349658bf3cd30669d36e76ce8f8d5a0a6

mk/config.mk

@@ -51,6 +51,7 @@ KBUILD=build/kernel
 export TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
 INSTALLER=\
+	export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
 	export PATH="$(PREFIX_PATH):$$PATH" && \
  	installer/target/release/redox_installer $(INSTALLER_FLAGS)
 

mk/prefix.mk

@@ -5,7 +5,6 @@ PREFIX_PATH=$(ROOT)/$(PREFIX_INSTALL)/bin
 
 export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
 export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)
-export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN)
 
 prefix: $(PREFIX_INSTALL)
 

relibc

@@ -1 +1 @@
-Subproject commit e051b18490d5675fc7b2b25a86cc51753a5d560f
+Subproject commit 98c60c357f8a4ff29c00334469efff56a22cf12c

rust

@@ -1 +1 @@
-Subproject commit b9b9225c2a7295a8ecfd7f575ffc6fba7de72f28
+Subproject commit f5eee2c14346c7c6e919721e4b0221f73f2fca9e