From 1a367c62cd52b11d74f3810035cd25c368a3fe9e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 29 Apr 2014 11:38:51 -0700
Subject: rustc: Add search paths to dylib load paths

When a syntax extension is loaded by the compiler, the dylib that is opened may
have other dylibs that it depends on. The dynamic linker must be able to find
these libraries on the system or else the library will fail to load.

Currently, unix gets by with the use of rpaths. This relies on the dylib not
moving around too drastically relative to its dependencies. For windows,
however, this is no rpath available, and in theory unix should work without
rpaths as well.

This modifies the compiler to add all -L search directories to the dynamic
linker's set of load paths. This is currently managed through environment
variables for each platform.

Closes #13848
---
 src/libstd/unstable/dynamic_lib.rs | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/unstable/dynamic_lib.rs
index 441a60a5186..671cacbbb6f 100644
--- a/src/libstd/unstable/dynamic_lib.rs
+++ b/src/libstd/unstable/dynamic_lib.rs
@@ -15,12 +15,16 @@ Dynamic library facilities.
 A simple wrapper over the platform's dynamic library facilities
 
 */
+
 use c_str::ToCStr;
 use cast;
-use path;
 use ops::*;
 use option::*;
+use os;
+use path::GenericPath;
+use path;
 use result::*;
+use str;
 
 pub struct DynamicLibrary { handle: *u8}
 
@@ -59,6 +63,20 @@ impl DynamicLibrary {
         }
     }
 
+    /// Appends a path to the system search path for dynamic libraries
+    pub fn add_search_path(path: &path::Path) {
+        let (envvar, sep) = if cfg!(windows) {
+            ("PATH", ';' as u8)
+        } else if cfg!(target_os = "macos") {
+            ("DYLD_LIBRARY_PATH", ':' as u8)
+        } else {
+            ("LD_LIBRARY_PATH", ':' as u8)
+        };
+        let newenv = os::getenv_as_bytes(envvar).unwrap_or(~[]);
+        let newenv = newenv + &[sep] + path.as_vec();
+        os::setenv(envvar, str::from_utf8(newenv).unwrap());
+    }
+
     /// Access the value at the symbol of the dynamic library
     pub unsafe fn symbol<T>(&self, symbol: &str) -> Result<T, ~str> {
         // This function should have a lifetime constraint of 'a on
@@ -237,7 +255,6 @@ pub mod dl {
         FreeLibrary(handle as *libc::c_void); ()
     }
 
-    #[link_name = "kernel32"]
     extern "system" {
         fn SetLastError(error: libc::size_t);
         fn LoadLibraryW(name: *libc::c_void) -> *libc::c_void;
-- 
cgit 1.4.1-3-g733a5