mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-07 13:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try producing the binary format native to each platform if we're going to try to dlopen/LoadLibrary it.

Browse Source
This commit is contained in:
Nick Lewycky
2020-08-06 17:40:27 -07:00
parent 7f8bad3972
commit ace5072169
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/compiler-llvm/src/config.rs
View File

@@ -99,6 +99,22 @@ impl LLVM {
}
fn target_triple(&self, target: &Target) -> TargetTriple {
// Hack: we're using is_pic to determine whether this is a native
// build or not.
let binary_format = if self.is_pic {
match target.triple().operating_system {
wasmer_compiler::OperatingSystem::Darwin
| wasmer_compiler::OperatingSystem::MacOSX {
major: _,
minor: _,
patch: _,
} => target_lexicon::BinaryFormat::Macho,
wasmer_compiler::OperatingSystem::Windows => target_lexicon::BinaryFormat::Coff,
_ => target_lexicon::BinaryFormat::Elf,
}
} else {
target_lexicon::BinaryFormat::Elf
};
let operating_system =
if target.triple().operating_system == wasmer_compiler::OperatingSystem::Darwin {
// LLVM detects static relocation + darwin + 64-bit and
@@ -116,7 +132,7 @@ impl LLVM {
vendor: target.triple().vendor.clone(),
operating_system,
environment: target.triple().environment,
binary_format: target_lexicon::BinaryFormat::Elf,
binary_format,
};
TargetTriple::create(&triple.to_string())
}