Mercurial > vanilla

annotate lang/rust/patch-clang.patch @ 1177:6dd3148ac08d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
network/bridge-utils: initial import, closes #1221
author David Demelier <markand@malikania.fr>
date Wed, 23 Oct 2019 20:05:00 +0200
parents e45b5d1810ab
children 6af48cb79e02
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/librustc_target/spec/linux_musl_base.rs.orig 2019-10-15 14:51:21.989949084 +0200
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ src/librustc_target/spec/linux_musl_base.rs 2019-10-15 14:51:42.253949707 +0200
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -24,6 +24,7 @@
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 base.pre_link_objects_exe_crt.push("crt1.o".to_string());
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 base.pre_link_objects_exe_crt.push("crti.o".to_string());
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 base.post_link_objects_crt.push("crtn.o".to_string());
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 + base.post_link_objects_crt.push("-lunwind".to_string());
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
8
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 // These targets statically link libc by default
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 base.crt_static_default = true;
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 --- 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
12 +++ 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
13 @@ -23,6 +23,5 @@
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 }
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
15
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 #[cfg(target_env = "musl")]
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 -#[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
18 -#[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
19 +#[link(name = "unwind")]
e45b5d1810ab lang/rust: initial import, closes #1097
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 extern {}