Skip to content

Commit

Permalink
auto merge of #12584 : alexcrichton/rust/windows-files, r=brson
Browse files Browse the repository at this point in the history
These commits fix handling of binary files on windows by using the raw `CreateFile` apis directly, also splitting out the windows/unix implementations to their own files because everything was configured between the two platforms.

With this fix in place, this also switches `rustc` to using libnative instead of libgreen. I have confirmed that this PR passes through try on all bots.
  • Loading branch information
bors committed Feb 27, 2014
2 parents 68a92c5 + 8c157ed commit f01a9a8
Show file tree
Hide file tree
Showing 20 changed files with 1,346 additions and 1,179 deletions.
4 changes: 2 additions & 2 deletions mk/crates.mk
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ DEPS_test := std extra collections getopts serialize term
DEPS_time := std serialize

TOOL_DEPS_compiletest := test green rustuv getopts
TOOL_DEPS_rustdoc := rustdoc green rustuv
TOOL_DEPS_rustc := rustc green rustuv
TOOL_DEPS_rustdoc := rustdoc native
TOOL_DEPS_rustc := rustc native
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
Expand Down
7 changes: 6 additions & 1 deletion src/driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#[no_uv];

#[cfg(rustdoc)]
extern crate this = "rustdoc";

#[cfg(rustc)]
extern crate this = "rustc";

fn main() { this::main() }
extern crate native;

#[start]
fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, this::main) }
Loading

0 comments on commit f01a9a8

Please sign in to comment.