Mercurial > vanilla

annotate lang/rust/patch-clang.patch @ 1252:b811a6479213

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnu/libidn2: upgrade to 2.3.2
author David Demelier <markand@malikania.fr>
date Mon, 01 Nov 2021 12:48:34 +0100
parents 6af48cb79e02
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1176
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- src/libunwind/lib.rs.orig 2019-10-15 14:54:58.457955734 +0200
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ src/libunwind/lib.rs 2019-10-15 14:55:28.705956663 +0200
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -23,6 +23,5 @@
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 }
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
5
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 #[cfg(target_env = "musl")]
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 -#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 -#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 +#[link(name = "unwind")]
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 extern {}
1201
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
11 --- src/librustc_target/spec/linux_musl_base.rs.orig 2019-09-23 21:15:52.000000000 +0000
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
12 +++ src/librustc_target/spec/linux_musl_base.rs 2019-10-31 13:19:59.189184637 +0000
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
13 @@ -24,9 +24,10 @@
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
14 base.pre_link_objects_exe_crt.push("crt1.o".to_string());
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
15 base.pre_link_objects_exe_crt.push("crti.o".to_string());
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
16 base.post_link_objects_crt.push("crtn.o".to_string());
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
17 + base.post_link_objects_crt.push("-lunwind".to_string());
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
18
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
19 // These targets statically link libc by default
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
20 - base.crt_static_default = true;
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
21 + base.crt_static_default = false;
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
22 // These targets allow the user to choose between static and dynamic linking.
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
23 base.crt_static_respected = true;
6af48cb79e02 lang/rust: disable static by default
David Demelier <markand@malikania.fr>
parents: 1176
diff changeset
24