Skip to content

Commit 773db88

Browse files
committed
---
yaml --- r: 44939 b: refs/heads/master c: bc3bee4 h: refs/heads/master i: 44937: fa86c21 44935: 0faedcb v: v3
1 parent cdfd00b commit 773db88

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: dfb5c10dea0dd7bc56950148fa23fd02a07706fa
2+
refs/heads/master: bc3bee410a6967942d18cef59a781603a7db86e4
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/back/rpath.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,15 @@ pub fn minimize_rpaths(rpaths: &[Path]) -> ~[Path] {
198198
199199
#[cfg(unix)]
200200
mod test {
201+
// FIXME(#2119): the outer attribute should be #[cfg(unix, test)], then
202+
// these redundant #[cfg(test)] blocks can be removed
203+
#[cfg(test)]
201204
use core::prelude::*;
202-
205+
#[cfg(test)]
203206
use back::rpath::{get_absolute_rpath, get_install_prefix_rpath};
207+
#[cfg(test)]
204208
use back::rpath::{get_relative_to, get_rpath_relative_to_output};
209+
#[cfg(test)]
205210
use back::rpath::{minimize_rpaths, rpaths_to_flags};
206211
207212
#[test]

0 commit comments

Comments
 (0)