Skip to content

Commit 26bb42e

Browse files
nrcalexcrichton
authored andcommitted
---
yaml --- r: 104926 b: refs/heads/snap-stage3 c: 3301223 h: refs/heads/master v: v3
1 parent fe74556 commit 26bb42e

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 083d423976359c3a0222907b588df534cfc17a28
4+
refs/heads/snap-stage3: 3301223c99574d53bbdcd06ac85b3cec255128e0
55
refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/auxiliary/linkage1.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@
1010

1111
#[no_mangle]
1212
pub static foo: int = 3;
13+
14+
pub fn bar() {}

branches/snap-stage3/src/test/run-pass/linkage1.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ extern {
2626
}
2727

2828
fn main() {
29+
// It appears that the --as-needed flag to linkers will not pull in a dynamic
30+
// library unless it satisfies a non weak undefined symbol. The 'other' crate
31+
// is compiled as a dynamic library where it would only be used for a
32+
// weak-symbol as part of an executable, so the dynamic library woudl be
33+
// discarded. By adding and calling `other::bar`, we get around this problem.
34+
other::bar();
35+
2936
assert!(!foo.is_null());
3037
assert_eq!(unsafe { *foo }, 3);
3138
assert!(something_that_should_never_exist.is_null());

0 commit comments

Comments
 (0)