Skip to content

Commit

Permalink
Update to Rust 1.78.0
Browse files Browse the repository at this point in the history
  • Loading branch information
topjohnwu committed May 3, 2024
1 parent af37fd9 commit 6d99867
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
2 changes: 1 addition & 1 deletion common.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2022-2024 Google LLC.
# SPDX-License-Identifier: Apache-2.0

RUST_VERSION='1.77.2'
RUST_VERSION='1.78.0'

NDK_VERSION='r27-beta1'
NDK_DIR_VERSION=$NDK_VERSION
Expand Down
3 changes: 2 additions & 1 deletion config-darwin.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
change-id = 102579
change-id = 121754

[llvm]
thin-lto = true
Expand Down Expand Up @@ -40,6 +40,7 @@ llvm-tools = true
jemalloc = true
lto = "thin"
strip = true
codegen-units = 1

[target.aarch64-apple-darwin]
llvm-has-rust-patches = false
Expand Down
3 changes: 2 additions & 1 deletion config-linux.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
change-id = 102579
change-id = 121754

[llvm]
thin-lto = true
Expand Down Expand Up @@ -41,6 +41,7 @@ llvm-tools = true
use-lld = "self-contained"
lto = "thin"
strip = true
codegen-units = 1

[target.x86_64-unknown-linux-gnu]
llvm-has-rust-patches = false
Expand Down
3 changes: 2 additions & 1 deletion config-windows.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
change-id = 102579
change-id = 121754

[llvm]
targets = "AArch64;ARM;X86;RISCV"
Expand Down Expand Up @@ -39,6 +39,7 @@ channel = "nightly"
lld = true
llvm-tools = true
strip = true
codegen-units = 1

[dist]
include-mingw-linker = true
Expand Down
13 changes: 13 additions & 0 deletions patches/fix_lib_llvm_path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index 701bd585..115bcda4 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -519,7 +519,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
// link to make llvm-config happy.
if builder.llvm_link_shared() && target.contains("apple-darwin") {
let lib_name = find_llvm_lib_name("dylib");
- let lib_llvm = out_dir.join("build").join("lib").join(lib_name);
+ let lib_llvm = out_dir.join("lib").join(lib_name);
if !lib_llvm.exists() {
t!(builder.symlink_file("libLLVM.dylib", &lib_llvm));
}

0 comments on commit 6d99867

Please sign in to comment.