Skip to content

Commit cfdd028

Browse files
nrcalexcrichton
authored andcommitted
---
yaml --- r: 150064 b: refs/heads/try2 c: 3301223 h: refs/heads/master v: v3
1 parent 40e8fca commit cfdd028

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 083d423976359c3a0222907b588df534cfc17a28
8+
refs/heads/try2: 3301223c99574d53bbdcd06ac85b3cec255128e0
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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)