Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sdk: Rust 1.41 #711

Merged
merged 2 commits into from
Feb 4, 2020
Merged

sdk: Rust 1.41 #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
082ac3a
sdk: Update Rust to 1.41
tjkirch Feb 3, 2020
83a6cd6
sdk: bump to v0.7
tjkirch Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions extras/sdk-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion extras/sdk-container/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion extras/sdk-container/hashes/rust
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SHA512 (rustc-1.40.0-src.tar.xz) = b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
SHA512 (rustc-1.41.0-src.tar.xz) = 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd