diff options
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/front/eval.rs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs index ce08daf5c50..2dc76bd793b 100644 --- a/src/comp/front/eval.rs +++ b/src/comp/front/eval.rs @@ -285,7 +285,11 @@ fn eval_crate_directive(ctx cx, env e, @ast::crate_directive cdir, str prefix, case (some(?f)) { file_path = f; } case (none) { } } - auto full_path = prefix + std::fs::path_sep() + file_path; + auto full_path = if (std::fs::path_is_absolute(file_path)) { + file_path + } else { + prefix + std::fs::path_sep() + file_path + }; if (cx.mode == mode_depend) { cx.deps += [full_path]; ret; } auto p0 = new_parser(cx.sess, e, full_path, cx.chpos, @@ -306,7 +310,11 @@ fn eval_crate_directive(ctx cx, env e, @ast::crate_directive cdir, str prefix, case (ast::cdir_dir_mod(?id, ?dir_opt, ?cdirs, ?attrs)) { auto path = id; alt (dir_opt) { case (some(?d)) { path = d; } case (none) { } } - auto full_path = prefix + std::fs::path_sep() + path; + auto full_path = if (std::fs::path_is_absolute(path)) { + path + } else { + prefix + std::fs::path_sep() + path + }; auto m0 = eval_crate_directives_to_mod(cx, e, cdirs, full_path); auto i = @rec(ident=id, attrs=attrs, |