summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-03-20 14:36:49 +0000
committerbors <bors@rust-lang.org>2023-03-20 14:36:49 +0000
commit8460ca823e8367a30dda430efda790588b8c84d3 (patch)
tree1e32b07304207ef4353c452da4bca3cbc7fba53d /src
parent2c8cc343237b8f7d5a3c3703e3a87f2eb2c54a74 (diff)
parent51bdb0f085d02aeab0adbf4b497afc22d6b26f3f (diff)
downloadrust-1.68.1.tar.gz
rust-1.68.1.zip
Auto merge of #109335 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.68.1
[stable] 1.68.1 release

This packages up a set of release notes, version bump, and backports of:

* Don't eagerly convert principal to string #108162
*  Revert "enable ThinLTO for rustc on x86_64-pc-windows-msvc dist builds" #109094
*  Create dirs for build_triple #109111
*  Fix linker detection for clang with prefix #109156
*  ci: use apt install --download-only for solaris debs #108951

The last of those is not yet stable-accepted but I expect it to be, we will drop it and rebuild artifacts if we don't actually approve it.

r? `@Mark-Simulacrum`
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/lib.rs1
-rwxr-xr-xsrc/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh10
-rw-r--r--src/ci/github-actions/ci.yml1
-rw-r--r--src/version2
4 files changed, 6 insertions, 8 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index d44b96cfb99..0474ab344fe 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -593,6 +593,7 @@ impl Build {
 
         // Make a symbolic link so we can use a consistent directory in the documentation.
         let build_triple = build.out.join(&build.build.triple);
+        t!(fs::create_dir_all(&build_triple));
         let host = build.out.join("host");
         if let Err(e) = symlink_dir(&build.config, &build_triple, &host) {
             if e.kind() != ErrorKind::AlreadyExists {
diff --git a/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh b/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
index cf784a66ae4..3939b4b7c41 100755
--- a/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
+++ b/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
@@ -32,24 +32,22 @@ cd solaris
 
 dpkg --add-architecture $APT_ARCH
 apt-get update
-apt-get download $(apt-cache depends --recurse --no-replaces \
+apt-get install -y --download-only                           \
   libc:$APT_ARCH                                             \
-  liblgrp-dev:$APT_ARCH                                      \
   liblgrp:$APT_ARCH                                          \
   libm-dev:$APT_ARCH                                         \
   libpthread:$APT_ARCH                                       \
   libresolv:$APT_ARCH                                        \
   librt:$APT_ARCH                                            \
-  libsendfile-dev:$APT_ARCH                                  \
   libsendfile:$APT_ARCH                                      \
   libsocket:$APT_ARCH                                        \
   system-crt:$APT_ARCH                                       \
-  system-header:$APT_ARCH                                    \
-  | grep "^\w")
+  system-header:$APT_ARCH
 
-for deb in *$APT_ARCH.deb; do
+for deb in /var/cache/apt/archives/*$APT_ARCH.deb; do
   dpkg -x $deb .
 done
+apt-get clean
 
 # The -dev packages are not available from the apt repository we're using.
 # However, those packages are just symlinks from *.so to *.so.<version>.
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index df07d4fae71..743b57ed46e 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -675,7 +675,6 @@ jobs:
                 --target=x86_64-pc-windows-msvc
                 --enable-full-tools
                 --enable-profiler
-                --set rust.lto=thin
               SCRIPT: PGO_HOST=x86_64-pc-windows-msvc src/ci/pgo.sh python x.py dist bootstrap --include-default-paths
               DIST_REQUIRE_ALL_TOOLS: 1
             <<: *job-windows-xl
diff --git a/src/version b/src/version
index ee2f4ca9130..0944cc489c2 100644
--- a/src/version
+++ b/src/version
@@ -1 +1 @@
-1.68.0
+1.68.1