Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.tar.gz filter=lfs diff=lfs merge=lfs -text
*.tar.xz filter=lfs diff=lfs merge=lfs -text
11 changes: 6 additions & 5 deletions 0001-Set-proper-llvm-targets.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@ Subject: [PATCH] Set proper llvm targets.

Signed-off-by: Matti Kosola <[email protected]>
Signed-off-by: Ruben De Smet <[email protected]>
Signed-off-by: Matti Viljanen <[email protected]>
---
config.example.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.example.toml b/config.example.toml
index e5df28a49af..48a9fafea6f 100644
index 5c1fac767..9a090fd33 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -99,7 +99,7 @@ change-id = 116881
@@ -96,7 +96,7 @@
# the resulting rustc being unable to compile for the disabled architectures.
#
# To add support for new targets, see https://rustc-dev-guide.rust-lang.org/building/new-target.html.
-#targets = "AArch64;ARM;BPF;Hexagon;LoongArch;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86"
+targets = "X86;ARM;AArch64"

# LLVM experimental targets to build support for. These targets are specified in
# the same format as above, but since these targets are experimental, they are
--
2.43.0
--
2.45.2

80 changes: 0 additions & 80 deletions 0002-Disable-statx-for-all-builds.-JB-50106.patch

This file was deleted.

11 changes: 6 additions & 5 deletions 0003-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ allows the same rustc binary to be used for all builds.

Signed-off-by: David Greaves <[email protected]>
Signed-off-by: Ruben De Smet <[email protected]>
Signed-off-by: Matti Viljanen <[email protected]>
---
compiler/rustc_session/src/config.rs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index f745bc390ca..934f16ab4ab 100644
index 4f259960a..16defdafb 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -2241,7 +2241,14 @@ pub fn parse_target_triple(
@@ -1922,7 +1922,14 @@ pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches
})
}
Some(target) => TargetTriple::TargetTriple(target),
Expand All @@ -33,7 +34,7 @@ index f745bc390ca..934f16ab4ab 100644
+ }
}
}
--
2.43.0

--
2.45.2

17 changes: 9 additions & 8 deletions 0004-Force-the-target-when-building-for-CompileKind-Host.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,25 @@ Currently hardwired to be i686-unknown-linux-gnu

Signed-off-by: David Greaves <[email protected]>
Signed-off-by: Ruben De Smet <[email protected]>
Signed-off-by: Matti Viljanen <[email protected]>
---
src/tools/cargo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
src/tools/cargo/src/cargo/core/compiler/mod.rs | 3 +++
1 file changed, 3 insertions(+)

diff --git a/src/tools/cargo/src/cargo/core/compiler/mod.rs b/src/tools/cargo/src/cargo/core/compiler/mod.rs
index 7024a2ac5..ebce975a9 100644
index 3b0510ac9..6b745db92 100644
--- a/src/tools/cargo/src/cargo/core/compiler/mod.rs
+++ b/src/tools/cargo/src/cargo/core/compiler/mod.rs
@@ -1111,6 +1111,9 @@ fn build_base_args(cx: &Context<'_, '_>, cmd: &mut ProcessBuilder, unit: &Unit)
@@ -1150,6 +1150,9 @@ fn build_base_args(

if let CompileKind::Target(n) = unit.kind {
cmd.arg("--target").arg(n.rustc_target());
+ } else {
+ debug!("kind is {:?} - Forcing this to be 686", unit.kind);
+ cmd.arg("--target").arg("i686-unknown-linux-gnu");
}

opt(
--
2.42.0
--
2.45.2

Loading