diff options
| -rw-r--r-- | src/ci/docker/scripts/musl.sh | 8 | ||||
| -rw-r--r-- | src/rustllvm/rustllvm.h | 2 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index f87ba8fe4e6..4ca7389d6d1 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -32,11 +32,17 @@ shift export CFLAGS="-fPIC $CFLAGS" -MUSL=musl-1.1.18 +# FIXME: remove the patch when upate to 1.1.20 +MUSL=musl-1.1.19 # may have been downloaded in a previous run if [ ! -d $MUSL ]; then curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - + # Patch to fix https://github.com/rust-lang/rust/issues/48967 + cd $MUSL && \ + curl "https://git.musl-libc.org/cgit/musl/patch/?id=610c5a8524c3d6cd3ac5a5f1231422e7648a3791" |\ + patch -p1 && \ + cd - fi cd $MUSL diff --git a/src/rustllvm/rustllvm.h b/src/rustllvm/rustllvm.h index f4bd78147f6..1070068b998 100644 --- a/src/rustllvm/rustllvm.h +++ b/src/rustllvm/rustllvm.h @@ -22,8 +22,6 @@ #include "llvm/ExecutionEngine/MCJIT.h" #include "llvm/IR/IRBuilder.h" #include "llvm/IR/InlineAsm.h" -#include "llvm/IR/InlineAsm.h" -#include "llvm/IR/LLVMContext.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" #include "llvm/Support/CommandLine.h" diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index b2aa5cfb444..c2f0687a5a9 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -261,6 +261,7 @@ impl Builder { self.rust_version = self.version("rust", "x86_64-unknown-linux-gnu"); self.cargo_version = self.version("cargo", "x86_64-unknown-linux-gnu"); self.rls_version = self.version("rls", "x86_64-unknown-linux-gnu"); + self.clippy_version = self.version("clippy", "x86_64-unknown-linux-gnu"); self.rustfmt_version = self.version("rustfmt", "x86_64-unknown-linux-gnu"); self.llvm_tools_version = self.version("llvm-tools", "x86_64-unknown-linux-gnu"); |