about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-07-21 17:31:35 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-07-21 21:31:25 -0700
commita0efd3a3d99a98e3399a4f07abe6a67cf0660335 (patch)
treeb66737059440b271396609ecb1254350db1f4645 /src/test
parentee2d3bc8a20545aa6bb660ae0e30ff143f160d16 (diff)
downloadrust-a0efd3a3d99a98e3399a4f07abe6a67cf0660335.tar.gz
rust-a0efd3a3d99a98e3399a4f07abe6a67cf0660335.zip
trans: Be a little more picky about dllimport
Currently you can hit a link error on MSVC by only referencing static items from
a crate (no functions for example) and then link to the crate statically (as all
Rust crates do 99% of the time). A detailed investigation can be found [on
github][details], but the tl;dr is that we need to stop applying dllimport so
aggressively.

This commit alters the application of dllimport on constants to only cases where
the crate the constant originated from will be linked as a dylib in some output
crate type. That way if we're just linking rlibs (like the motivation for this
issue) we won't use dllimport. For the compiler, however, (which has lots of
dylibs) we'll use dllimport.

[details]: https://github.com/rust-lang/rust/issues/26591#issuecomment-123513631

cc #26591
Diffstat (limited to 'src/test')
-rw-r--r--src/test/auxiliary/xcrate-static.rs15
-rw-r--r--src/test/run-pass/xcrate-static.rs17
2 files changed, 32 insertions, 0 deletions
diff --git a/src/test/auxiliary/xcrate-static.rs b/src/test/auxiliary/xcrate-static.rs
new file mode 100644
index 00000000000..85093869ba2
--- /dev/null
+++ b/src/test/auxiliary/xcrate-static.rs
@@ -0,0 +1,15 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// no-prefer-dynamic
+
+#![crate_type = "rlib"]
+
+pub static FOO: u8 = 8;
diff --git a/src/test/run-pass/xcrate-static.rs b/src/test/run-pass/xcrate-static.rs
new file mode 100644
index 00000000000..d1f08e726bc
--- /dev/null
+++ b/src/test/run-pass/xcrate-static.rs
@@ -0,0 +1,17 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// aux-build:xcrate-static.rs
+
+extern crate xcrate_static;
+
+fn main() {
+    println!("{}", xcrate_static::FOO);
+}