Skip to content

Commit 89d3632

Browse files
committed
---
yaml --- r: 46722 b: refs/heads/auto c: bc3bee4 h: refs/heads/master v: v3
1 parent d3285df commit 89d3632

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
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: dfb5c10dea0dd7bc56950148fa23fd02a07706fa
17+
refs/heads/auto: bc3bee410a6967942d18cef59a781603a7db86e4

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