From 80829af8723aa1289a180734915848c1dda38b2d Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 29 Sep 2011 22:58:17 -0700 Subject: [PATCH] Remove legacy library search paths --- mk/tests.mk | 2 +- src/comp/driver/rustc.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/tests.mk b/mk/tests.mk index 15aa8592352..1c298885dbf 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -326,7 +326,7 @@ stage2/lib/$(FT_LIB): test/$(FT).rc $(SREQ2$(CFG_HOST_TRIPLE)) test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs stage2/lib/$(FT_LIB) $(SREQ2$(CFG_HOST_TRIPLE)) @$(call E, compile_and_link: $@) - $(STAGE2) -o $@ $< + $(STAGE2) -L stage2/lib -o $@ $< test/$(FT_DRIVER).out: test/$(FT_DRIVER)$(X) $(SREQ2$(CFG_HOST_TRIPLE)) $(Q)$(call CFG_RUN_TEST, $<) diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 1d5b39f9ac2..3907f1c3500 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -379,9 +379,9 @@ fn build_session_options(binary: str, match: getopts::match) }; let library_search_paths = [ - fs::connect(sysroot, "lib"), // FIXME: legacy fs::connect(sysroot, "lib/rustc/" + target )]; let lsp_vec = getopts::opt_strs(match, "L"); + // FIXME: These should probably go in front of the defaults for lsp: str in lsp_vec { library_search_paths += [lsp]; } let cfg = parse_cfgspecs(getopts::opt_strs(match, "cfg"));