From 082ac3a4c637a772bc0956f3b83f3a5a594ce399 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjk@amazon.com>
Date: Mon, 3 Feb 2020 13:37:13 -0800
Subject: [PATCH 1/2] sdk: Update Rust to 1.41

/codegen-backends no longer exists so we no longer have to strip its large
artifacts.
---
 extras/sdk-container/Dockerfile  | 5 ++---
 extras/sdk-container/hashes/rust | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/extras/sdk-container/Dockerfile b/extras/sdk-container/Dockerfile
index 84ec2e55a59..3de064d888c 100644
--- a/extras/sdk-container/Dockerfile
+++ b/extras/sdk-container/Dockerfile
@@ -250,7 +250,7 @@ RUN \
 
 ARG ARCH
 ARG TARGET="${ARCH}-thar-linux-gnu"
-ARG RUSTVER="1.40.0"
+ARG RUSTVER="1.41.0"
 
 USER builder
 WORKDIR /home/builder
@@ -405,8 +405,7 @@ RUN \
   export HOSTDIR="/usr/libexec/rust/lib/rustlib/x86_64-unknown-linux-gnu/" ; \
   diff /usr/libexec/rust/lib/libLLVM-*.so ${HOSTDIR}/lib/libLLVM-*.so && \
   strip -g /usr/libexec/rust/lib/libLLVM-*.so && \
-  ln -f /usr/libexec/rust/lib/libLLVM-*.so ${HOSTDIR}/lib/ && \
-  strip -g ${HOSTDIR}/codegen-backends/librustc_codegen_llvm-llvm.so
+  ln -f /usr/libexec/rust/lib/libLLVM-*.so ${HOSTDIR}/lib/
 
 # Add Go programs to $PATH and sync timestamps to avoid rebuilds.
 RUN \
diff --git a/extras/sdk-container/hashes/rust b/extras/sdk-container/hashes/rust
index f2f74e33596..cbe64cc504d 100644
--- a/extras/sdk-container/hashes/rust
+++ b/extras/sdk-container/hashes/rust
@@ -1 +1 @@
-SHA512 (rustc-1.40.0-src.tar.xz) = b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
+SHA512 (rustc-1.41.0-src.tar.xz) = 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd

From 83a6cd64a72eee4fb22a1a3c7f52218fcf14c595 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjk@amazon.com>
Date: Mon, 3 Feb 2020 13:37:56 -0800
Subject: [PATCH 2/2] sdk: bump to v0.7

---
 Makefile.toml                 | 2 +-
 extras/sdk-container/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.toml b/Makefile.toml
index 7a092f7b44b..7afac907951 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -19,7 +19,7 @@ DOCKER_BUILDKIT = "1"
 
 [env.development]
 # Defined here to allow us to override ${BUILDSYS_ARCH} on the command line.
-BUILDSYS_SDK_IMAGE = "thar/sdk-${BUILDSYS_ARCH}:v0.6"
+BUILDSYS_SDK_IMAGE = "thar/sdk-${BUILDSYS_ARCH}:v0.7"
 # Permit pulling directly Upstream URLs when lookaside cache results in MISSes.
 BUILDSYS_ALLOW_UPSTREAM_SOURCE_URL = "true"
 # Extra flags used when spawning containers.
diff --git a/extras/sdk-container/Makefile b/extras/sdk-container/Makefile
index 341ae796a1a..773224b0ee0 100644
--- a/extras/sdk-container/Makefile
+++ b/extras/sdk-container/Makefile
@@ -1,6 +1,6 @@
 ARCH ?= $(shell uname -m)
 
-VERSION := v0.6
+VERSION := v0.7
 TAG := thar/sdk-$(ARCH):$(VERSION)
 ARCHIVE := thar-sdk-$(ARCH)-$(VERSION).tar.gz