mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 04:35:39 +03:00
69851bdae1
Also disable full bootstrapping. Since we always bootstrap from $pkgver minus one
we don't need it and it increases buildtime considerably.
Also keep in mind that we have to add new arches in multiple steps:
1. Compile with the upstream triplets, compiling alpine's triplets in
2. Compile again, now with our triplets selected as build/target, now that
rustc knows about them
This means that the produced compilers MUST ONLY be used to bootstrap the actual
compilers with our triplets, DO NOT use these to compile packages! Since x86_64
still uses the usual triplets it's fine to upgrade/add packages for that arch
though, please DO NOT do this for armhf,armv7,aarch64,ppc64le or x86 though!
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
We don't need those, we provide musl ourselves.
|
|
--- rustc-1.35.0-src/src/bootstrap/compile.rs
|
|
+++ rustc-1.35.0-src/src/bootstrap/compile.rs
|
|
@@ -114,20 +114,7 @@ impl Step for Std {
|
|
fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned<String>) {
|
|
let libdir = builder.sysroot_libdir(*compiler, target);
|
|
|
|
- // Copies the crt(1,i,n).o startup objects
|
|
- //
|
|
- // Since musl supports fully static linking, we can cross link for it even
|
|
- // with a glibc-targeting toolchain, given we have the appropriate startup
|
|
- // files. As those shipped with glibc won't work, copy the ones provided by
|
|
- // musl so we have them on linux-gnu hosts.
|
|
- if target.contains("musl") {
|
|
- for &obj in &["crt1.o", "crti.o", "crtn.o"] {
|
|
- builder.copy(
|
|
- &builder.musl_root(target).unwrap().join("lib").join(obj),
|
|
- &libdir.join(obj),
|
|
- );
|
|
- }
|
|
- } else if target.ends_with("-wasi") {
|
|
+ if target.ends_with("-wasi") {
|
|
for &obj in &["crt1.o"] {
|
|
builder.copy(
|
|
&builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj),
|
|
--- rustc-1.35.0-src/vendor/libc/src/unix/mod.rs
|
|
+++ rustc-1.35.0-src/vendor/libc/src/unix/mod.rs
|
|
@@ -306,13 +306,6 @@ cfg_if! {
|
|
} else if #[cfg(feature = "use_std")] {
|
|
// cargo build, don't pull in anything extra as the libstd dep
|
|
// already pulls in all libs.
|
|
- } else if #[cfg(target_env = "musl")] {
|
|
- #[cfg_attr(feature = "rustc-dep-of-std",
|
|
- link(name = "c", kind = "static",
|
|
- cfg(target_feature = "crt-static")))]
|
|
- #[cfg_attr(feature = "rustc-dep-of-std",
|
|
- link(name = "c", cfg(not(target_feature = "crt-static"))))]
|
|
- extern {}
|
|
} else if #[cfg(target_os = "emscripten")] {
|
|
#[link(name = "c")]
|
|
extern {}
|