user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make rustc's host triple agree with the build system's

Browse source
This commit is contained in:
Brian Anderson 2011-09-29 11:31:28 -07:00
parent 0148daa058
commit ab8338fb5a
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/comp/driver/rustc.rs
View file

@ -309,7 +309,15 @@ fn build_target_config(sopts: @session::options) -> @session::config {
}
fn host_triple() -> str {
str::str_from_cstr(llvm::llvm::LLVMRustGetHostTriple())
// Get the host triple out of the build environment. This ensures that our
// idea of the host triple is the same as for the set of libraries we've
// actually built. We can't just take LLVM's host triple because they
// normalize all ix86 architectures to i386.
// FIXME: Instead of grabbing the host triple we really should be
// grabbing (at compile time) the target triple that this rustc is
// built with and calling that (at runtime) the host triple.
let ht = #env("CFG_HOST_TRIPLE");
ret ht != "" ? ht : fail "rustc built without CFG_HOST_TRIPLE";
}
fn build_session_options(binary: str, match: getopts::match)