Skip to content

Commit 77c4575

Browse files
nrcalexcrichton
authored andcommitted
---
yaml --- r: 106064 b: refs/heads/auto c: 3301223 h: refs/heads/master v: v3
1 parent e383245 commit 77c4575

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 083d423976359c3a0222907b588df534cfc17a28
16+
refs/heads/auto: 3301223c99574d53bbdcd06ac85b3cec255128e0
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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