Compare commits
5 Commits
imports/c8
...
c8-stream-
Author | SHA1 | Date | |
---|---|---|---|
8cf4232918 | |||
|
ccf4c7a77c | ||
5a9514f99f | |||
|
0ebc83c4d7 | ||
|
ca624d9167 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/rustc-1.58.1-src.tar.xz
|
SOURCES/rustc-1.75.0-src.tar.xz
|
||||||
SOURCES/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz
|
SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
783cb359829e7ea508deae659837f9bb360e46c8 SOURCES/rustc-1.58.1-src.tar.xz
|
9ad7bb54dc9572c103b855cdcc823addbb34d15d SOURCES/rustc-1.75.0-src.tar.xz
|
||||||
b8865d1192852214d6d9b0a0957d4b36c16832aa SOURCES/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz
|
55eaa32c99cc8ec970f2db2d340a605724589f9b SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
|
||||||
|
@ -0,0 +1,53 @@
|
|||||||
|
From 184d61d2c12aa2db01de9a14ccb2be0cfae5039b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Fri, 9 Jun 2023 15:23:08 -0700
|
||||||
|
Subject: [PATCH] Let environment variables override some default CPUs
|
||||||
|
|
||||||
|
---
|
||||||
|
.../src/spec/targets/powerpc64le_unknown_linux_gnu.rs | 2 +-
|
||||||
|
.../rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs | 2 +-
|
||||||
|
.../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
||||||
|
index 194c3170e683..9806ca78297c 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
pub fn target() -> Target {
|
||||||
|
let mut base = base::linux_gnu::opts();
|
||||||
|
- base.cpu = "ppc64le".into();
|
||||||
|
+ base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into();
|
||||||
|
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
|
||||||
|
base.max_atomic_width = Some(64);
|
||||||
|
base.stack_probes = StackProbeType::Inline;
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
||||||
|
index 6fc410eb2235..c8f84edb9715 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
||||||
|
@@ -5,7 +5,7 @@ pub fn target() -> Target {
|
||||||
|
let mut base = base::linux_gnu::opts();
|
||||||
|
base.endian = Endian::Big;
|
||||||
|
// z10 is the oldest CPU supported by LLVM
|
||||||
|
- base.cpu = "z10".into();
|
||||||
|
+ base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
|
||||||
|
// FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
|
||||||
|
// ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
|
||||||
|
// also strip v128 from the data_layout below to match the older LLVM's expectation.
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
|
||||||
|
index 80e267c163fa..8436a00e66d5 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
pub fn target() -> Target {
|
||||||
|
let mut base = base::linux_gnu::opts();
|
||||||
|
- base.cpu = "x86-64".into();
|
||||||
|
+ base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
|
||||||
|
base.plt_by_default = false;
|
||||||
|
base.max_atomic_width = Some(64);
|
||||||
|
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
@ -1,26 +0,0 @@
|
|||||||
From 9ac837c237568a6c1c5f0e979fcce208cd9c926a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ivan Mironov <mironov.ivan@gmail.com>
|
|
||||||
Date: Sun, 8 Dec 2019 17:23:08 +0500
|
|
||||||
Subject: [PATCH] Use lld provided by system for wasm
|
|
||||||
|
|
||||||
---
|
|
||||||
compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
|
|
||||||
index 4c954a1e567c..15c4f1bda5eb 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/wasm_base.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
|
|
||||||
@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
|
|
||||||
// arguments just yet
|
|
||||||
limit_rdylib_exports: false,
|
|
||||||
|
|
||||||
- // we use the LLD shipped with the Rust toolchain by default
|
|
||||||
- linker: Some("rust-lld".to_owned()),
|
|
||||||
+ linker: Some("lld".to_owned()),
|
|
||||||
lld_flavor: LldFlavor::Wasm,
|
|
||||||
linker_is_gnu: false,
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
53
SOURCES/0001-Use-lld-provided-by-system.patch
Normal file
53
SOURCES/0001-Use-lld-provided-by-system.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Wed, 1 Nov 2023 15:21:15 -0700
|
||||||
|
Subject: [PATCH] Use lld provided by system
|
||||||
|
|
||||||
|
---
|
||||||
|
compiler/rustc_target/src/spec/base/wasm.rs | 3 +--
|
||||||
|
compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
|
||||||
|
compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
|
||||||
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
|
||||||
|
index 87ade9e58cf4..2ddff95febab 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/base/wasm.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/base/wasm.rs
|
||||||
|
@@ -91,8 +91,7 @@ macro_rules! args {
|
||||||
|
// arguments just yet
|
||||||
|
limit_rdylib_exports: false,
|
||||||
|
|
||||||
|
- // we use the LLD shipped with the Rust toolchain by default
|
||||||
|
- linker: Some("rust-lld".into()),
|
||||||
|
+ linker: Some("lld".into()),
|
||||||
|
linker_flavor: LinkerFlavor::WasmLld(Cc::No),
|
||||||
|
|
||||||
|
pre_link_args,
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
||||||
|
index 9aa95a35f8e5..a9172f9441b7 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
||||||
|
@@ -17,7 +17,7 @@ pub fn target() -> Target {
|
||||||
|
static_position_independent_executables: true,
|
||||||
|
relro_level: RelroLevel::Full,
|
||||||
|
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
|
||||||
|
- linker: Some("rust-lld".into()),
|
||||||
|
+ linker: Some("lld".into()),
|
||||||
|
features:
|
||||||
|
"-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
|
||||||
|
.into(),
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
||||||
|
index 5abfb8162f70..13cb43bda1a4 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
||||||
|
@@ -16,6 +16,7 @@ pub fn target() -> Target {
|
||||||
|
base.plt_by_default = false;
|
||||||
|
base.max_atomic_width = Some(64);
|
||||||
|
base.entry_abi = Conv::X86_64Win64;
|
||||||
|
+ base.linker = Some("lld".into());
|
||||||
|
|
||||||
|
// We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
|
||||||
|
// enable these CPU features explicitly before their first use, otherwise their instructions
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
@ -0,0 +1,102 @@
|
|||||||
|
From df0d6f1d8b46db82d7599ca8eff6e8f844cf52f2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Thu, 28 Sep 2023 18:14:28 -0700
|
||||||
|
Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
|
||||||
|
|
||||||
|
---
|
||||||
|
config.example.toml | 5 +++++
|
||||||
|
src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
|
||||||
|
src/bootstrap/src/core/config/config.rs | 8 ++++++++
|
||||||
|
src/bootstrap/src/lib.rs | 5 +++++
|
||||||
|
4 files changed, 22 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.example.toml b/config.example.toml
|
||||||
|
index e5df28a49af6..2fcd8b8cb057 100644
|
||||||
|
--- a/config.example.toml
|
||||||
|
+++ b/config.example.toml
|
||||||
|
@@ -807,6 +807,11 @@ change-id = 116881
|
||||||
|
# target triples containing `-none`, `nvptx`, `switch`, or `-uefi`.
|
||||||
|
#no-std = <platform-specific> (bool)
|
||||||
|
|
||||||
|
+# Copy libc and CRT objects into the target lib/self-contained/ directory.
|
||||||
|
+# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
|
||||||
|
+# targets may ignore this setting if they have nothing to be contained.
|
||||||
|
+#self-contained = <platform-specific> (bool)
|
||||||
|
+
|
||||||
|
# =============================================================================
|
||||||
|
# Distribution options
|
||||||
|
#
|
||||||
|
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
|
||||||
|
index 7021a9543582..11555c65ca87 100644
|
||||||
|
--- a/src/bootstrap/src/core/build_steps/compile.rs
|
||||||
|
+++ b/src/bootstrap/src/core/build_steps/compile.rs
|
||||||
|
@@ -302,6 +302,10 @@ fn copy_self_contained_objects(
|
||||||
|
compiler: &Compiler,
|
||||||
|
target: TargetSelection,
|
||||||
|
) -> Vec<(PathBuf, DependencyType)> {
|
||||||
|
+ if builder.self_contained(target) != Some(true) {
|
||||||
|
+ return vec![];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
let libdir_self_contained = builder.sysroot_libdir(*compiler, target).join("self-contained");
|
||||||
|
t!(fs::create_dir_all(&libdir_self_contained));
|
||||||
|
let mut target_deps = vec![];
|
||||||
|
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
||||||
|
index 0a9175aa3ea5..a2e028b25036 100644
|
||||||
|
--- a/src/bootstrap/src/core/config/config.rs
|
||||||
|
+++ b/src/bootstrap/src/core/config/config.rs
|
||||||
|
@@ -533,6 +533,7 @@ pub struct Target {
|
||||||
|
pub wasi_root: Option<PathBuf>,
|
||||||
|
pub qemu_rootfs: Option<PathBuf>,
|
||||||
|
pub no_std: bool,
|
||||||
|
+ pub self_contained: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Target {
|
||||||
|
@@ -541,6 +542,9 @@ pub fn from_triple(triple: &str) -> Self {
|
||||||
|
if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") {
|
||||||
|
target.no_std = true;
|
||||||
|
}
|
||||||
|
+ if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") {
|
||||||
|
+ target.self_contained = true;
|
||||||
|
+ }
|
||||||
|
target
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1051,6 +1055,7 @@ struct TomlTarget {
|
||||||
|
wasi_root: Option<String> = "wasi-root",
|
||||||
|
qemu_rootfs: Option<String> = "qemu-rootfs",
|
||||||
|
no_std: Option<bool> = "no-std",
|
||||||
|
+ self_contained: Option<bool> = "self-contained",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1600,6 +1605,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
|
||||||
|
if let Some(s) = cfg.no_std {
|
||||||
|
target.no_std = s;
|
||||||
|
}
|
||||||
|
+ if let Some(s) = cfg.self_contained {
|
||||||
|
+ target.self_contained = s;
|
||||||
|
+ }
|
||||||
|
target.cc = cfg.cc.map(PathBuf::from);
|
||||||
|
target.cxx = cfg.cxx.map(PathBuf::from);
|
||||||
|
target.ar = cfg.ar.map(PathBuf::from);
|
||||||
|
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
||||||
|
index 33b8f1a7ce72..f36e53187576 100644
|
||||||
|
--- a/src/bootstrap/src/lib.rs
|
||||||
|
+++ b/src/bootstrap/src/lib.rs
|
||||||
|
@@ -1335,6 +1335,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
|
||||||
|
self.config.target_config.get(&target).map(|t| t.no_std)
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /// Returns `true` if this is a self-contained `target`, if defined
|
||||||
|
+ fn self_contained(&self, target: TargetSelection) -> Option<bool> {
|
||||||
|
+ self.config.target_config.get(&target).map(|t| t.self_contained)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/// Returns `true` if the target will be tested using the `remote-test-client`
|
||||||
|
/// and `remote-test-server` binaries.
|
||||||
|
fn remote_tested(&self, target: TargetSelection) -> bool {
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
@ -0,0 +1,33 @@
|
|||||||
|
From 776146e9ebb6bbe17a37bfad955f3dac95317275 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Thu, 16 Nov 2023 10:42:23 -0800
|
||||||
|
Subject: [PATCH] bootstrap: only show PGO warnings when verbose
|
||||||
|
|
||||||
|
Building rustc with `--rust-profile-use` is currently dumping a lot of
|
||||||
|
warnings of "no profile data available for function" from `rustc_smir`
|
||||||
|
and `stable_mir`. These simply aren't exercised by the current profile-
|
||||||
|
gathering steps, but that's to be expected for new or experimental
|
||||||
|
functionality. I think for most people, these warnings will be just
|
||||||
|
noise, so it makes sense to only have them in verbose builds.
|
||||||
|
---
|
||||||
|
src/bootstrap/src/core/build_steps/compile.rs | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
|
||||||
|
index af69860df1c5..51e4195827fc 100644
|
||||||
|
--- a/src/bootstrap/src/core/build_steps/compile.rs
|
||||||
|
+++ b/src/bootstrap/src/core/build_steps/compile.rs
|
||||||
|
@@ -887,7 +887,9 @@ fn run(self, builder: &Builder<'_>) {
|
||||||
|
} else if let Some(path) = &builder.config.rust_profile_use {
|
||||||
|
if compiler.stage == 1 {
|
||||||
|
cargo.rustflag(&format!("-Cprofile-use={path}"));
|
||||||
|
- cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
|
||||||
|
+ if builder.is_verbose() {
|
||||||
|
+ cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
|
||||||
|
+ }
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
@ -0,0 +1,78 @@
|
|||||||
|
From 79bb610c8fc5d9df7dd4720ae847b8f17e7b1ad4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Thu, 28 Sep 2023 18:18:16 -0700
|
||||||
|
Subject: [PATCH 2/2] set an external library path for wasm32-wasi
|
||||||
|
|
||||||
|
---
|
||||||
|
compiler/rustc_codegen_ssa/src/back/link.rs | 9 +++++++++
|
||||||
|
compiler/rustc_target/src/spec/mod.rs | 2 ++
|
||||||
|
compiler/rustc_target/src/spec/targets/wasm32_wasi.rs | 6 +++++-
|
||||||
|
3 files changed, 16 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
|
||||||
|
index dd9d277fb775..3d0f0502f255 100644
|
||||||
|
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
|
||||||
|
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
|
||||||
|
@@ -1496,6 +1496,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
|
||||||
|
return file_path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ if let Some(lib_path) = &sess.target.options.external_lib_path {
|
||||||
|
+ let file_path = Path::new(lib_path.as_ref()).join(name);
|
||||||
|
+ if file_path.exists() {
|
||||||
|
+ return file_path;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
for search_path in fs.search_paths() {
|
||||||
|
let file_path = search_path.dir.join(name);
|
||||||
|
if file_path.exists() {
|
||||||
|
@@ -1982,6 +1988,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
|
||||||
|
let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
|
||||||
|
cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
|
||||||
|
}
|
||||||
|
+ if let Some(lib_path) = &sess.target.options.external_lib_path {
|
||||||
|
+ cmd.include_path(Path::new(lib_path.as_ref()));
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add options making relocation sections in the produced ELF files read-only
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
|
||||||
|
index f04799482c83..25410b37ba24 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/mod.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/mod.rs
|
||||||
|
@@ -1874,6 +1874,7 @@ pub struct TargetOptions {
|
||||||
|
/// Objects to link before and after all other object code.
|
||||||
|
pub pre_link_objects: CrtObjects,
|
||||||
|
pub post_link_objects: CrtObjects,
|
||||||
|
+ pub external_lib_path: Option<StaticCow<str>>,
|
||||||
|
/// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
|
||||||
|
pub pre_link_objects_self_contained: CrtObjects,
|
||||||
|
pub post_link_objects_self_contained: CrtObjects,
|
||||||
|
@@ -2352,6 +2353,7 @@ fn default() -> TargetOptions {
|
||||||
|
relro_level: RelroLevel::None,
|
||||||
|
pre_link_objects: Default::default(),
|
||||||
|
post_link_objects: Default::default(),
|
||||||
|
+ external_lib_path: None,
|
||||||
|
pre_link_objects_self_contained: Default::default(),
|
||||||
|
post_link_objects_self_contained: Default::default(),
|
||||||
|
link_self_contained: LinkSelfContainedDefault::False,
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
|
||||||
|
index 6dbcb01ea436..2151f86d0648 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
|
||||||
|
@@ -86,7 +86,11 @@ pub fn target() -> Target {
|
||||||
|
options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained();
|
||||||
|
|
||||||
|
// FIXME: Figure out cases in which WASM needs to link with a native toolchain.
|
||||||
|
- options.link_self_contained = LinkSelfContainedDefault::True;
|
||||||
|
+ options.link_self_contained = LinkSelfContainedDefault::False;
|
||||||
|
+
|
||||||
|
+ options.pre_link_objects = options.pre_link_objects_self_contained.clone();
|
||||||
|
+ options.post_link_objects = options.post_link_objects_self_contained.clone();
|
||||||
|
+ options.external_lib_path = Some("/usr/wasm32-wasi/lib/wasm32-wasi".into());
|
||||||
|
|
||||||
|
// Right now this is a bit of a workaround but we're currently saying that
|
||||||
|
// the target by default has a static crt which we're taking as a signal
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
181
SOURCES/macros.rust-toolset
Normal file
181
SOURCES/macros.rust-toolset
Normal file
@ -0,0 +1,181 @@
|
|||||||
|
# Explicitly use bindir tools, in case others are in the PATH,
|
||||||
|
# like the rustup shims in a user's ~/.cargo/bin/.
|
||||||
|
#
|
||||||
|
# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
|
||||||
|
# https://github.com/rust-lang/cargo/issues/6397
|
||||||
|
# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
|
||||||
|
# it never writes to ~/.cargo during rpmbuild.
|
||||||
|
%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
|
||||||
|
%__rustc /usr/bin/rustc
|
||||||
|
%__rustdoc /usr/bin/rustdoc
|
||||||
|
|
||||||
|
# rustflags_opt_level: default optimization level
|
||||||
|
#
|
||||||
|
# It corresponds to the "-Copt-level" rustc command line option.
|
||||||
|
%rustflags_opt_level 3
|
||||||
|
|
||||||
|
# rustflags_debuginfo: default verbosity of debug information
|
||||||
|
#
|
||||||
|
# It corresponds to the "-Cdebuginfo" rustc command line option.
|
||||||
|
# In some cases, it might be required to override this macro with "1" or even
|
||||||
|
# "0", if memory usage gets too high during builds on some resource-constrained
|
||||||
|
# architectures (most likely on 32-bit architectures), which will however
|
||||||
|
# reduce the quality of the produced debug symbols.
|
||||||
|
%rustflags_debuginfo 2
|
||||||
|
|
||||||
|
# rustflags_codegen_units: default number of parallel code generation units
|
||||||
|
#
|
||||||
|
# The default value of "1" results in generation of better code, but comes at
|
||||||
|
# the cost of longer build times.
|
||||||
|
%rustflags_codegen_units 1
|
||||||
|
|
||||||
|
# build_rustflags: default compiler flags for rustc (RUSTFLAGS)
|
||||||
|
#
|
||||||
|
# -Copt-level: set optimization level (default: highest optimization level)
|
||||||
|
# -Cdebuginfo: set debuginfo verbosity (default: full debug information)
|
||||||
|
# -Ccodegen-units: set number of parallel code generation units (default: 1)
|
||||||
|
#
|
||||||
|
# ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
|
||||||
|
%build_rustflags %{shrink:
|
||||||
|
-Copt-level=%rustflags_opt_level
|
||||||
|
-Cdebuginfo=%rustflags_debuginfo
|
||||||
|
-Ccodegen-units=%rustflags_codegen_units
|
||||||
|
}
|
||||||
|
|
||||||
|
# __cargo_common_opts: common command line flags for cargo
|
||||||
|
#
|
||||||
|
# _smp_mflags: run builds and tests in parallel
|
||||||
|
%__cargo_common_opts %{?_smp_mflags}
|
||||||
|
|
||||||
|
%cargo_prep(V:) (\
|
||||||
|
%{__mkdir} -p .cargo \
|
||||||
|
cat > .cargo/config << EOF \
|
||||||
|
[build]\
|
||||||
|
rustc = "%{__rustc}"\
|
||||||
|
rustdoc = "%{__rustdoc}"\
|
||||||
|
\
|
||||||
|
[env]\
|
||||||
|
CFLAGS = "%{build_cflags}"\
|
||||||
|
CXXFLAGS = "%{build_cxxflags}"\
|
||||||
|
LDFLAGS = "%{build_ldflags}"\
|
||||||
|
\
|
||||||
|
[install]\
|
||||||
|
root = "%{buildroot}%{_prefix}"\
|
||||||
|
\
|
||||||
|
[term]\
|
||||||
|
verbose = true\
|
||||||
|
EOF\
|
||||||
|
%if 0%{-V:1}\
|
||||||
|
%{__tar} -xoaf %{S:%{-V*}}\
|
||||||
|
cat >> .cargo/config << EOF \
|
||||||
|
\
|
||||||
|
[source.crates-io]\
|
||||||
|
replace-with = "vendored-sources"\
|
||||||
|
\
|
||||||
|
[source.vendored-sources]\
|
||||||
|
directory = "./vendor"\
|
||||||
|
EOF\
|
||||||
|
%endif\
|
||||||
|
)
|
||||||
|
|
||||||
|
# __cargo_parse_opts: function-like macro which parses common flags into the
|
||||||
|
# equivalent command-line flags for cargo
|
||||||
|
%__cargo_parse_opts(naf:) %{shrink:\
|
||||||
|
%{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \
|
||||||
|
%{-n:--no-default-features} \
|
||||||
|
%{-a:--all-features} \
|
||||||
|
%{-f:--features %{-f*}} \
|
||||||
|
%{nil}
|
||||||
|
}
|
||||||
|
|
||||||
|
# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
|
||||||
|
# Fedora's rust-packaging, because that change would break anyone that's
|
||||||
|
# already passing arguments directly to cargo after the macro. Instead, one can
|
||||||
|
# explicitly use --no-default-features, --all-features, or --features XYZ.
|
||||||
|
|
||||||
|
# cargo_build: builds the crate with cargo
|
||||||
|
%cargo_build \
|
||||||
|
%{shrink:\
|
||||||
|
%{__cargo} build \
|
||||||
|
%{__cargo_common_opts} \
|
||||||
|
--release \
|
||||||
|
}
|
||||||
|
|
||||||
|
# cargo_test: runs the test suite with cargo
|
||||||
|
#
|
||||||
|
# To pass command-line arguments to the cargo test runners directly (for
|
||||||
|
# example, to skip certain tests during package builds), the
|
||||||
|
# "cargo test" argument parsing need to be bypassed,
|
||||||
|
# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
|
||||||
|
# match "foo".
|
||||||
|
%cargo_test \
|
||||||
|
%{shrink:\
|
||||||
|
%{__cargo} test \
|
||||||
|
%{__cargo_common_opts} \
|
||||||
|
--release \
|
||||||
|
--no-fail-fast \
|
||||||
|
}
|
||||||
|
|
||||||
|
# cargo_install: install files into the buildroot
|
||||||
|
#
|
||||||
|
# For "binary" crates, this macro installs all "bin" build targets to _bindir
|
||||||
|
# inside the buildroot. The "--no-track" option prevents the creation of the
|
||||||
|
# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
|
||||||
|
# of a specific binary has been installed, but which conflicts between builds
|
||||||
|
# of different Rust applications and is not needed when building RPM packages.
|
||||||
|
%cargo_install \
|
||||||
|
%{shrink: \
|
||||||
|
%{__cargo} install \
|
||||||
|
%{__cargo_common_opts} \
|
||||||
|
--no-track \
|
||||||
|
--path . \
|
||||||
|
} \
|
||||||
|
|
||||||
|
# cargo_license: print license information for all crate dependencies
|
||||||
|
#
|
||||||
|
# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
|
||||||
|
# linked into the final binary to be considered.
|
||||||
|
#
|
||||||
|
# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
|
||||||
|
# before sorting the results to ensure reproducible output of this macro.
|
||||||
|
#
|
||||||
|
# This macro must be called with the same feature flags as other cargo macros,
|
||||||
|
# in particular, "cargo_build", otherwise its output will be incomplete.
|
||||||
|
#
|
||||||
|
# The "cargo tree" command called by this macro will fail if there are missing
|
||||||
|
# (optional) dependencies.
|
||||||
|
%cargo_license(naf:)\
|
||||||
|
%{shrink:\
|
||||||
|
%{__cargo} tree \
|
||||||
|
--workspace \
|
||||||
|
--offline \
|
||||||
|
--edges no-build,no-dev,no-proc-macro \
|
||||||
|
--no-dedupe \
|
||||||
|
--target all \
|
||||||
|
%{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
|
||||||
|
--prefix none \
|
||||||
|
--format "{l}: {p}" \
|
||||||
|
| sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g" \
|
||||||
|
| sort -u
|
||||||
|
}
|
||||||
|
|
||||||
|
# cargo_license_summary: print license summary for all crate dependencies
|
||||||
|
#
|
||||||
|
# This macro works in the same way as cargo_license, except that it only prints
|
||||||
|
# a list of licenses, and not the complete license information for every crate
|
||||||
|
# in the dependency tree. This is useful for determining the correct License
|
||||||
|
# tag for packages that contain compiled Rust binaries.
|
||||||
|
%cargo_license_summary(naf:)\
|
||||||
|
%{shrink:\
|
||||||
|
%{__cargo} tree \
|
||||||
|
--workspace \
|
||||||
|
--offline \
|
||||||
|
--edges no-build,no-dev,no-proc-macro \
|
||||||
|
--no-dedupe \
|
||||||
|
--target all \
|
||||||
|
%{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
|
||||||
|
--prefix none \
|
||||||
|
--format "# {l}" \
|
||||||
|
| sed -e "s: / :/:g" -e "s:/: OR :g" \
|
||||||
|
| sort -u \
|
||||||
|
}
|
@ -1,42 +0,0 @@
|
|||||||
--- rustc-1.56.0-src/Cargo.lock.orig 2021-10-18 02:52:36.000000000 -0700
|
|
||||||
+++ rustc-1.56.0-src/Cargo.lock 2021-10-19 18:00:47.999793566 -0700
|
|
||||||
@@ -1895,7 +1895,6 @@
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
- "libssh2-sys",
|
|
||||||
"libz-sys",
|
|
||||||
"openssl-sys",
|
|
||||||
"pkg-config",
|
|
||||||
@@ -1918,20 +1917,6 @@
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
-name = "libssh2-sys"
|
|
||||||
-version = "0.2.19"
|
|
||||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
|
|
||||||
-dependencies = [
|
|
||||||
- "cc",
|
|
||||||
- "libc",
|
|
||||||
- "libz-sys",
|
|
||||||
- "openssl-sys",
|
|
||||||
- "pkg-config",
|
|
||||||
- "vcpkg",
|
|
||||||
-]
|
|
||||||
-
|
|
||||||
-[[package]]
|
|
||||||
name = "libz-sys"
|
|
||||||
version = "1.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
--- rustc-1.56.0-src/vendor/git2/Cargo.toml.orig 2021-10-18 04:05:54.000000000 -0700
|
|
||||||
+++ rustc-1.56.0-src/vendor/git2/Cargo.toml 2021-10-19 17:57:37.960500359 -0700
|
|
||||||
@@ -52,7 +52,7 @@
|
|
||||||
version = "0.1.39"
|
|
||||||
|
|
||||||
[features]
|
|
||||||
-default = ["ssh", "https", "ssh_key_from_memory"]
|
|
||||||
+default = ["https"]
|
|
||||||
https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"]
|
|
||||||
ssh = ["libgit2-sys/ssh"]
|
|
||||||
ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
|
|
@ -1,66 +0,0 @@
|
|||||||
--- rustc-1.58.0-src/Cargo.lock.orig 2022-01-11 16:13:10.125323813 -0800
|
|
||||||
+++ rustc-1.58.0-src/Cargo.lock 2022-01-11 16:22:54.313011908 -0800
|
|
||||||
@@ -909,7 +909,6 @@
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
- "libnghttp2-sys",
|
|
||||||
"libz-sys",
|
|
||||||
"openssl-sys",
|
|
||||||
"pkg-config",
|
|
||||||
@@ -1927,16 +1926,6 @@
|
|
||||||
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
-name = "libnghttp2-sys"
|
|
||||||
-version = "0.1.4+1.41.0"
|
|
||||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
|
|
||||||
-dependencies = [
|
|
||||||
- "cc",
|
|
||||||
- "libc",
|
|
||||||
-]
|
|
||||||
-
|
|
||||||
-[[package]]
|
|
||||||
name = "libz-sys"
|
|
||||||
version = "1.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
--- rustc-1.58.0-src/src/tools/cargo/Cargo.toml.orig 2022-01-11 16:13:10.127323771 -0800
|
|
||||||
+++ rustc-1.58.0-src/src/tools/cargo/Cargo.toml 2022-01-11 16:14:50.721203730 -0800
|
|
||||||
@@ -22,7 +22,7 @@
|
|
||||||
cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
|
|
||||||
crates-io = { path = "crates/crates-io", version = "0.33.0" }
|
|
||||||
crossbeam-utils = "0.8"
|
|
||||||
-curl = { version = "0.4.41", features = ["http2"] }
|
|
||||||
+curl = { version = "0.4.41", features = [] }
|
|
||||||
curl-sys = "0.4.50"
|
|
||||||
env_logger = "0.9.0"
|
|
||||||
pretty_env_logger = { version = "0.4", optional = true }
|
|
||||||
--- rustc-1.58.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2022-01-11 03:18:44.000000000 -0800
|
|
||||||
+++ rustc-1.58.0-src/src/tools/cargo/src/cargo/core/package.rs 2022-01-11 16:13:10.127323771 -0800
|
|
||||||
@@ -419,14 +419,8 @@
|
|
||||||
// Also note that pipelining is disabled as curl authors have indicated
|
|
||||||
// that it's buggy, and we've empirically seen that it's buggy with HTTP
|
|
||||||
// proxies.
|
|
||||||
- let mut multi = Multi::new();
|
|
||||||
- let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
|
|
||||||
- multi
|
|
||||||
- .pipelining(false, multiplexing)
|
|
||||||
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
|
|
||||||
-
|
|
||||||
- // let's not flood crates.io with connections
|
|
||||||
- multi.set_max_host_connections(2)?;
|
|
||||||
+ let multi = Multi::new();
|
|
||||||
+ let multiplexing = false;
|
|
||||||
|
|
||||||
Ok(PackageSet {
|
|
||||||
packages: package_ids
|
|
||||||
@@ -655,7 +649,7 @@
|
|
||||||
macro_rules! try_old_curl {
|
|
||||||
($e:expr, $msg:expr) => {
|
|
||||||
let result = $e;
|
|
||||||
- if cfg!(target_os = "macos") {
|
|
||||||
+ if cfg!(any(target_os = "linux", target_os = "macos")) {
|
|
||||||
if let Err(e) = result {
|
|
||||||
warn!("ignoring libcurl {} error: {}", $msg, e);
|
|
||||||
}
|
|
@ -1,44 +0,0 @@
|
|||||||
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
index 638b2a7b5a9f..79d4ecf4cb91 100644
|
|
||||||
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
@@ -763,7 +763,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
|
|
||||||
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
|
|
||||||
{
|
|
||||||
info!("linker output: {:?}", out);
|
|
||||||
- warn!("Linker does not support -no-pie command line option. Retrying without.");
|
|
||||||
+ info!("Linker does not support -no-pie command line option. Retrying without.");
|
|
||||||
for arg in cmd.take_args() {
|
|
||||||
if arg.to_string_lossy() != "-no-pie" {
|
|
||||||
cmd.arg(arg);
|
|
||||||
@@ -782,7 +782,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
|
|
||||||
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
|
|
||||||
{
|
|
||||||
info!("linker output: {:?}", out);
|
|
||||||
- warn!(
|
|
||||||
+ info!(
|
|
||||||
"Linker does not support -static-pie command line option. Retrying with -static instead."
|
|
||||||
);
|
|
||||||
// Mirror `add_(pre,post)_link_objects` to replace CRT objects.
|
|
||||||
@@ -1507,15 +1507,14 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
}
|
|
||||||
|
|
||||||
fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
|
|
||||||
- let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
|
|
||||||
+ // Only use PIE if explicitly specified.
|
|
||||||
+ let explicit_pic =
|
|
||||||
+ matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic | RelocModel::Pie));
|
|
||||||
+ let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
|
|
||||||
(CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
|
|
||||||
- (CrateType::Executable, false, RelocModel::Pic | RelocModel::Pie) => {
|
|
||||||
- LinkOutputKind::DynamicPicExe
|
|
||||||
- }
|
|
||||||
+ (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
|
|
||||||
(CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
|
|
||||||
- (CrateType::Executable, true, RelocModel::Pic | RelocModel::Pie) => {
|
|
||||||
- LinkOutputKind::StaticPicExe
|
|
||||||
- }
|
|
||||||
+ (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
|
|
||||||
(CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
|
|
||||||
(_, true, _) => LinkOutputKind::StaticDylib,
|
|
||||||
(_, false, _) => LinkOutputKind::DynamicDylib,
|
|
21
SOURCES/rustc-1.70.0-rust-gdb-substitute-path.patch
Normal file
21
SOURCES/rustc-1.70.0-rust-gdb-substitute-path.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
|
||||||
|
index 9abed30ea6f7..e4bf55df3688 100755
|
||||||
|
--- a/src/etc/rust-gdb
|
||||||
|
+++ b/src/etc/rust-gdb
|
||||||
|
@@ -13,8 +13,6 @@ fi
|
||||||
|
# Find out where the pretty printer Python module is
|
||||||
|
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
|
||||||
|
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
|
||||||
|
-# Get the commit hash for path remapping
|
||||||
|
-RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
|
||||||
|
|
||||||
|
# Run GDB with the additional arguments that load the pretty printers
|
||||||
|
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
||||||
|
@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
|
||||||
|
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
|
||||||
|
--directory="$GDB_PYTHON_MODULE_DIRECTORY" \
|
||||||
|
-iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
|
||||||
|
- -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
|
||||||
|
+ -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
|
||||||
|
"$@"
|
||||||
|
|
42
SOURCES/rustc-1.75.0-disable-libssh2.patch
Normal file
42
SOURCES/rustc-1.75.0-disable-libssh2.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
--- ./rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-11-12 12:24:35.000000000 -0800
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-11-14 17:01:32.010125953 -0800
|
||||||
|
@@ -2027,7 +2027,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libssh2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -2060,20 +2059,6 @@
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libssh2-sys"
|
||||||
|
-version = "0.3.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
- "libz-sys",
|
||||||
|
- "openssl-sys",
|
||||||
|
- "pkg-config",
|
||||||
|
- "vcpkg",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- ./rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-11-14 17:01:32.010125953 -0800
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-11-14 17:02:44.645097701 -0800
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
curl-sys = "0.4.68"
|
||||||
|
filetime = "0.2.22"
|
||||||
|
flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
|
||||||
|
-git2 = "0.18.1"
|
||||||
|
+git2 = { version = "0.18.1", default-features = false, features = ["https"] }
|
||||||
|
git2-curl = "0.19.0"
|
||||||
|
gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
|
||||||
|
gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
|
894
SPECS/rust.spec
894
SPECS/rust.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user