-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
43 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,7 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: "Jan Alexander Steffens (heftig)" <[email protected]> | ||
Date: Thu, 6 May 2021 20:14:58 +0200 | ||
Subject: [PATCH] bootstrap: Change libexec dir | ||
|
||
--- | ||
src/bootstrap/dist.rs | 2 +- | ||
src/bootstrap/tool.rs | 2 +- | ||
2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs | ||
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs | ||
index 32da4ac29a46..78a5faeae04b 100644 | ||
--- a/src/bootstrap/dist.rs | ||
+++ b/src/bootstrap/dist.rs | ||
--- a/src/bootstrap/src/core/build_steps/dist.rs | ||
+++ b/src/bootstrap/src/core/build_steps/dist.rs | ||
@@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { | ||
}, | ||
builder.kind, | ||
|
@@ -21,10 +11,10 @@ index 32da4ac29a46..78a5faeae04b 100644 | |
} | ||
|
||
let libdir_relative = builder.libdir_relative(compiler); | ||
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs | ||
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs | ||
index e6d27757ac66..70e499bdabbe 100644 | ||
--- a/src/bootstrap/tool.rs | ||
+++ b/src/bootstrap/tool.rs | ||
--- a/src/bootstrap/src/core/build_steps/tool.rs | ||
+++ b/src/bootstrap/src/core/build_steps/tool.rs | ||
@@ -689,7 +689,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> { | ||
|
||
// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,3 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: "Jan Alexander Steffens (heftig)" <[email protected]> | ||
Date: Fri, 12 Mar 2021 17:31:56 +0100 | ||
Subject: [PATCH] compiler: Change LLVM targets | ||
|
||
- Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu | ||
- Change i686-unknown-linux-gnu to use i686-pc-linux-gnu | ||
|
||
Reintroduce the aliasing that was removed in 1.52.0 and alias the -pc- | ||
triples to the -unknown- triples. This avoids defining proper -pc- | ||
targets, as things break when this is done: | ||
|
||
- The crate ecosystem expects the -unknown- targets. Making -pc- | ||
rustc's host triple (and thus default target) would break various | ||
crates. | ||
- Firefox's build breaks when the host triple (from | ||
`rustc --version --verbose`) is different from the target triple | ||
(from `rustc --print target-list`) that best matches autoconf. | ||
--- | ||
compiler/rustc_session/src/config.rs | 2 +- | ||
compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- | ||
compiler/rustc_target/src/spec/mod.rs | 9 +++++++++ | ||
.../rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- | ||
4 files changed, 12 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs | ||
index f2ee52262ade..6a813c4b8707 100644 | ||
--- a/compiler/rustc_session/src/config.rs | ||
|
@@ -38,8 +13,8 @@ index f2ee52262ade..6a813c4b8707 100644 | |
} | ||
diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | ||
index 73e536a7e4d9..af48d437533c 100644 | ||
--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | ||
+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | ||
--- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | ||
+++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | ||
@@ -9,7 +9,7 @@ pub fn target() -> Target { | ||
base.stack_probes = StackProbeType::X86; | ||
|
||
|
@@ -71,8 +46,8 @@ index 8909cf33af91..e5b5bce4c290 100644 | |
/// If this target is a path, the file name (without extension) is returned. | ||
diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | ||
index a91ab365b668..d605eb9ccf81 100644 | ||
--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | ||
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | ||
--- 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 | ||
@@ -14,7 +14,7 @@ pub fn target() -> Target { | ||
| SanitizerSet::THREAD; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,7 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: "Jan Alexander Steffens (heftig)" <[email protected]> | ||
Date: Sat, 6 Nov 2021 22:42:06 +0100 | ||
Subject: [PATCH] compiler: Use wasm-ld for wasm targets | ||
|
||
We don't ship rust-lld. | ||
--- | ||
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 341763aadbaf..dbb075affc18 100644 | ||
--- a/compiler/rustc_target/src/spec/wasm_base.rs | ||
+++ b/compiler/rustc_target/src/spec/wasm_base.rs | ||
--- a/compiler/rustc_target/src/spec/base/wasm.rs | ||
+++ b/compiler/rustc_target/src/spec/base/wasm.rs | ||
@@ -89,8 +89,7 @@ macro_rules! args { | ||
// arguments just yet | ||
limit_rdylib_exports: false, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters