Skip to content

Commit 7074b50

Browse files
committed
---
yaml --- r: 48431 b: refs/heads/snap-stage3 c: bc3bee4 h: refs/heads/master i: 48429: 1532b61 48427: ff3ed7e 48423: 8d570d5 48415: ad02302 v: v3
1 parent f4b8185 commit 7074b50

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,7 +1,7 @@
11
---
22
refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: dfb5c10dea0dd7bc56950148fa23fd02a07706fa
4+
refs/heads/snap-stage3: bc3bee410a6967942d18cef59a781603a7db86e4
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)