T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cross-compilation via the CLI (#3212)

Browse Source 
The `strategy` was chosen after the `target` which meant that the target
choice was blown away because the `strategy` method overwrites the
currently configured compiler.
This commit is contained in:
Alex Crichton
2021-08-19 11:05:54 -05:00
committed by GitHub
parent f1793934d6
commit db79438ddb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib.rs
View File

@@ -298,13 +298,15 @@ impl CommonOptions {
fn config(&self, target: Option<&str>) -> Result<Config> { fn config(&self, target: Option<&str>) -> Result<Config> {
let mut config = Config::new(); let mut config = Config::new();
// Set the target before setting any cranelift options // Set the compiler and target before setting any cranelift options,
// since the strategy determines which compiler is in use and the target
// will reset any target-specific options.
config.strategy(pick_compilation_strategy(self.cranelift, self.lightbeam)?)?;
if let Some(target) = target { if let Some(target) = target {
config.target(target)?; config.target(target)?;
} }
config config
.strategy(pick_compilation_strategy(self.cranelift, self.lightbeam)?)?
.cranelift_debug_verifier(self.enable_cranelift_debug_verifier) .cranelift_debug_verifier(self.enable_cranelift_debug_verifier)
.debug_info(self.debug_info) .debug_info(self.debug_info)
.cranelift_opt_level(self.opt_level()) .cranelift_opt_level(self.opt_level())