From 49da7bb62475f229e718cd579c4fa01b0d6c1899 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Wed, 20 May 2020 13:30:46 -0600
Subject: [PATCH 1/2] Update apps

This pins compiler-builtins to 0.1.27 to fix building on the
nightly-2019-11-04 toolchain used.
---
 apps/firmware-setup    | 2 +-
 apps/firmware-smmstore | 2 +-
 apps/firmware-update   | 2 +-
 apps/gop-policy        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/firmware-setup b/apps/firmware-setup
index 53193af9..2e50d872 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit 53193af9b4ee478ed99bcbaf115db4e88910f520
+Subproject commit 2e50d8728830db571e77a405f070349fc16a2b98
diff --git a/apps/firmware-smmstore b/apps/firmware-smmstore
index 2e94590e..c70661a4 160000
--- a/apps/firmware-smmstore
+++ b/apps/firmware-smmstore
@@ -1 +1 @@
-Subproject commit 2e94590eace3292f054a61a8c052e45918505b24
+Subproject commit c70661a4e3d6a2413313a75b8deb62fccd275e62
diff --git a/apps/firmware-update b/apps/firmware-update
index 61fa25b9..e3713f1a 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit 61fa25b9b43e61b1256a0aa953f24537b44a2801
+Subproject commit e3713f1a5e257faa1aef3c5163654b07f0efecdc
diff --git a/apps/gop-policy b/apps/gop-policy
index 023cdfec..c1cd7872 160000
--- a/apps/gop-policy
+++ b/apps/gop-policy
@@ -1 +1 @@
-Subproject commit 023cdfec481d6f18ae62cbacbd98931f8ec5f630
+Subproject commit c1cd7872d599d37fc8c53b22bfd66a68f366bf3d

From 90ef74499a773fc48416c58e602d9a6f672791a0 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Wed, 20 May 2020 13:34:10 -0600
Subject: [PATCH 2/2] Pin cargo-xbuild to 0.5.29

The new handling of LTO options in 0.5.30+ breaks building on older
toolchains.
---
 scripts/deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deps.sh b/scripts/deps.sh
index cea29db2..6216cb03 100755
--- a/scripts/deps.sh
+++ b/scripts/deps.sh
@@ -51,7 +51,7 @@ rustup component add --toolchain "$(cat rust-toolchain)" rust-src
 if ! which cargo-xbuild > /dev/null
 then
   msg "Installing cargo-xbuild"
-  cargo +nightly install cargo-xbuild
+  cargo +nightly install cargo-xbuild --version=0.5.29
 fi
 
 msg "\x1B[32mSuccessfully installed dependencies"