Skip to content

Commit

Permalink
Merge pull request #2315 from wasmerio/cranelift-native
Browse files Browse the repository at this point in the history
Cranelift native
  • Loading branch information
syrusakbary authored May 15, 2021
2 parents 28edc78 + 96643d8 commit 43dd1fa
Show file tree
Hide file tree
Showing 8 changed files with 228 additions and 172 deletions.
121 changes: 60 additions & 61 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ ifeq ($(ENABLE_CRANELIFT), 1)
ifneq ($(LIBC), musl)
compilers_engines += cranelift-native
endif
else ifeq ($(IS_AARCH64), 1)
# The object crate doesn't support yet Darwin + Aarch64 relocations
ifneq ($(IS_DARWIN), 1)
compilers_engines += cranelift-native
endif
endif
endif
endif
Expand Down
3 changes: 1 addition & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,8 @@ skip = [
{ name = "semver", version = "=0.9.0" },
{ name = "semver-parser", version = "=0.7.0" },
{ name = "rustc_version", version = "=0.2.3" },
{ name = "gimli", version = "=0.24.0" },
{ name = "itertools", version = "0.9.0" },
{ name = "wasmparser", version = "0.57.0" },
{ name = "wast", version = "=24.0.0" },
]
# Similarly to `skip` allows you to skip certain crates during duplicate
# detection. Unlike skip, it also includes the entire tree of transitive
Expand Down
Loading

0 comments on commit 43dd1fa

Please sign in to comment.