language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 00:24:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix M1 mac build

Browse source 
I changed wasmer to use the llvm backend because it compiles the fastest and supports aarch64.
If we later run into llvm versioning issues of some sort, we should switch this to cranelift.
Also re-adds serde-json which is used on macos.
This commit is contained in:
Brendan Hansknecht 2021-11-06 14:08:19 -07:00
parent 73e2cbcb1e
commit 40f0271ccf
6 changed files with 88 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/build/Cargo.toml
View file

@ -32,6 +32,9 @@ tempfile = "3.2.0"
inkwell = { path = "../../vendor/inkwell", optional = true }
target-lexicon = "0.12.2"
[target.'cfg(target_os = "macos")'.dependencies]
serde_json = "1.0.69"
[features]
default = ["llvm", "target-aarch64", "target-x86_64", "target-wasm32"]
target-arm = []

2
compiler/gen_wasm/Cargo.toml
View file

@ -12,7 +12,7 @@ roc_mono = { path = "../mono" }
bumpalo = { version = "3.8.0", features = ["collections"] }
roc_std = { path = "../../roc_std" }
wasmer = { version = "2.0.0", default-features = false, features = ["default-singlepass", "default-universal"] }
wasmer = { version = "2.0.0", default-features = false, features = ["default-llvm", "default-universal"] }
[dev-dependencies]
roc_can = { path = "../can" }

2
compiler/test_gen/Cargo.toml
View file

@ -32,7 +32,7 @@ libc = "0.2.106"
inkwell = { path = "../../vendor/inkwell" }
target-lexicon = "0.12.2"
libloading = "0.7.1"
wasmer = { version = "2.0.0", default-features = false, features = ["default-singlepass", "default-universal"] }
wasmer = { version = "2.0.0", default-features = false, features = ["default-llvm", "default-universal"] }
wasmer-wasi = "2.0.0"
tempfile = "3.2.0"

2
compiler/test_wasm/Cargo.toml
View file

@ -9,7 +9,7 @@ edition = "2018"
# roc_module = { path = "../module" }
# roc_mono = { path = "../mono" }
wasmer = { version = "2.0.0", default-features = false, features = ["default-singlepass", "default-universal"] }
wasmer = { version = "2.0.0", default-features = false, features = ["default-llvm", "default-universal"] }
wasmer-wasi = "2.0.0"
roc_collections = { path = "../collections" }