about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-07-06 18:01:16 -0700
committerBrian Anderson <banderson@mozilla.com>2014-07-14 12:27:07 -0700
commit930abc156789db6ee897a68f02fac6af682cca5b (patch)
treec7642fb05be0a2fc5481059d46672649ecd91c7c /src
parentc5a2ac10972092c9610f4f0727e53c1a6782961e (diff)
downloadrust-930abc156789db6ee897a68f02fac6af682cca5b.tar.gz
rust-930abc156789db6ee897a68f02fac6af682cca5b.zip
Extract rpath to rustc_back::rpath
Diffstat (limited to 'src')
-rw-r--r--src/librustc/lib.rs2
-rw-r--r--src/librustc_back/lib.rs1
-rw-r--r--src/librustc_back/rpath.rs (renamed from src/librustc/back/rpath.rs)0
3 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 65124ceff1d..d5d754748f1 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -55,6 +55,7 @@ pub mod back {
     pub use rustc_back::arm;
     pub use rustc_back::mips;
     pub use rustc_back::mipsel;
+    pub use rustc_back::rpath;
     pub use rustc_back::svh;
     pub use rustc_back::target_strs;
     pub use rustc_back::x86;
@@ -63,7 +64,6 @@ pub mod back {
     pub mod archive;
     pub mod link;
     pub mod lto;
-    pub mod rpath;
 
 }
 >>>>>>> Extract librustc_back from librustc
diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs
index 5334c499300..156a419bb2d 100644
--- a/src/librustc_back/lib.rs
+++ b/src/librustc_back/lib.rs
@@ -33,6 +33,7 @@ pub mod abi;
 pub mod arm;
 pub mod mips;
 pub mod mipsel;
+pub mod rpath;
 pub mod svh;
 pub mod target_strs;
 pub mod x86;
diff --git a/src/librustc/back/rpath.rs b/src/librustc_back/rpath.rs
index 6a133d8619a..6a133d8619a 100644
--- a/src/librustc/back/rpath.rs
+++ b/src/librustc_back/rpath.rs