diff options
| author | bors <bors@rust-lang.org> | 2014-05-18 14:41:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-18 14:41:35 -0700 |
| commit | e1403e1d8337cc1636471f79da4536409e2a0c2b (patch) | |
| tree | a043c3677af6799fa8e4006530940eeb3b18e29c /src/libsyntax | |
| parent | ea87f126bdf8de4acc4f74c14ac0ae10d95a2472 (diff) | |
| parent | 8cbda5da939e97d5dafde4a2a20927fb539bf80c (diff) | |
| download | rust-e1403e1d8337cc1636471f79da4536409e2a0c2b.tar.gz rust-e1403e1d8337cc1636471f79da4536409e2a0c2b.zip | |
auto merge of #14000 : pnkfelix/rust/fsk-fix-issue13732, r=alexcrichton
Fix #13732. This is a revised, much less hacky form of PR #13753 The changes here: * add instrumentation to aid debugging of linkage errors, * fine tune some things in the Makefile where we are telling binaries to use a host-oriented path for finding dynamic libraries, when it should be feeding the binaries a target-oriented path for dynamic libraries. * pass along the current stage number to run-make tests, and * skip certain tests when running atop stage1. Fix #13746 as well.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 1898e8bf000..e3b1037ccc0 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -524,6 +524,9 @@ fn load_extern_macros(krate: &ast::ViewItem, fld: &mut MacroExpander) { None => return }; + debug!("load_extern_macros: mapped crate {} to path {} and registrar {:s}", + crate_name, path.display(), registrar); + let lib = match DynamicLibrary::open(Some(&path)) { Ok(lib) => lib, // this is fatal: there are almost certainly macros we need |