diff options
| author | bors <bors@rust-lang.org> | 2024-06-05 08:10:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-05 08:10:32 +0000 |
| commit | 5ee2dfd2bcbb66a69a46aaa342204e0dfdb70516 (patch) | |
| tree | ece7f87dfaf2c9c863fe7b55c90dbac2e2b2a6af | |
| parent | a330e49593ee890f9197727a3a558b6e6b37f843 (diff) | |
| parent | f9150f6e3688010efba0cc7a88ee67a8e47bc9bd (diff) | |
| download | rust-5ee2dfd2bcbb66a69a46aaa342204e0dfdb70516.tar.gz rust-5ee2dfd2bcbb66a69a46aaa342204e0dfdb70516.zip | |
Auto merge of #126011 - workingjubilee:try-fix-solaris-build, r=workingjubilee
Silence double-symlink errors while building solaris toolchain Intended to address the current issues with the tree.
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh | 2 | ||||
| m--------- | src/doc/nomicon | 0 |
2 files changed, 1 insertions, 1 deletions
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 3939b4b7c41..d046b539036 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 @@ -54,7 +54,7 @@ apt-get clean # This makes all those symlinks. for lib in $(find -name '*.so.*'); do target=${lib%.so.*}.so - [ -e $target ] || ln -s ${lib##*/} $target + ln -s ${lib##*/} $target || echo "warning: silenced error symlinking $lib" done # Remove Solaris 11 functions that are optionally used by libbacktrace. diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 0d5f88475fe285affa6dbbc806e9e44d730797c +Subproject 0ebdacadbda8ce2cd8fbf93985e15af61a7ab89 |