]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8176 : catamorphism/rust/rustpkg-extern-mod, r=catamorphism
authorbors <bors@rust-lang.org>
Fri, 9 Aug 2013 23:17:10 +0000 (16:17 -0700)
committerbors <bors@rust-lang.org>
Fri, 9 Aug 2013 23:17:10 +0000 (16:17 -0700)
r? @graydon Also, notably, make rustpkgtest depend on the rustpkg executable (otherwise, tests that shell out to rustpgk might run when rustpkg doesn't exist).

1  2 
mk/tests.mk
src/librustc/back/rpath.rs
src/librustc/metadata/filesearch.rs
src/librustc/middle/resolve.rs
src/libsyntax/parse/parser.rs

diff --cc mk/tests.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge