diff options
| author | bors <bors@rust-lang.org> | 2013-05-29 00:52:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-29 00:52:47 -0700 |
| commit | e3e55c5c042778b0e50710221d6c0abdfc1119f0 (patch) | |
| tree | ba062ae35ed19b526af19400f6c7844e6d6f20e3 /src/librustpkg | |
| parent | 149960e0cf4d521465e8aa78fa8a7a247a5afaed (diff) | |
| parent | b4a3fe25c6fa35d5b243d6dfaee59306c4bcfda9 (diff) | |
| download | rust-e3e55c5c042778b0e50710221d6c0abdfc1119f0.tar.gz rust-e3e55c5c042778b0e50710221d6c0abdfc1119f0.zip | |
auto merge of #6793 : graydon/rust/drop-ast-before-llvm, r=Aatch
Diffstat (limited to 'src/librustpkg')
| -rw-r--r-- | src/librustpkg/rustpkg.rc | 2 | ||||
| -rw-r--r-- | src/librustpkg/util.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc index a419bffece7..ae4bfc6bc4b 100644 --- a/src/librustpkg/rustpkg.rc +++ b/src/librustpkg/rustpkg.rc @@ -101,7 +101,7 @@ impl<'self> PkgScript<'self> { input: input, sess: sess, cfg: cfg, - crate: crate, + crate: crate.unwrap(), build_dir: work_dir } } diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs index 7794dd47b69..80533b2d3b1 100644 --- a/src/librustpkg/util.rs +++ b/src/librustpkg/util.rs @@ -426,7 +426,7 @@ pub fn compile_crate_from_input(input: &driver::input, debug!("Calling compile_upto, outputs = %?", outputs); let (crate, _) = driver::compile_upto(sess, copy cfg, input, driver::cu_parse, Some(outputs)); - let mut crate = crate; + let mut crate = crate.unwrap(); debug!("About to inject link_meta info..."); // Inject the inferred link_meta info if it's not already there |