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

update target-lexicon

Browse source
This commit is contained in:
Folkert 2021-08-23 19:44:53 +02:00
parent 784f9a097c
commit 80358d14a3
9 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3916,9 +3916,9 @@ dependencies = [
[[package]] [[package]]
name = "target-lexicon" name = "target-lexicon"
version = "0.10.0" version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff"
[[package]] [[package]]
name = "tempfile" name = "tempfile"

2
cli/Cargo.toml
View file

@ -67,7 +67,7 @@ libc = "0.2"
libloading = "0.6" libloading = "0.6"
inkwell = { path = "../vendor/inkwell", optional = true } inkwell = { path = "../vendor/inkwell", optional = true }
target-lexicon = "0.10" target-lexicon = "0.12.2"
tempfile = "3.1.0" tempfile = "3.1.0"
[dev-dependencies] [dev-dependencies]

10
cli/src/main.rs
View file

@ -5,7 +5,7 @@ use roc_cli::{
use std::fs::{self, FileType}; use std::fs::{self, FileType};
use std::io; use std::io;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use target_lexicon::Triple; use target_lexicon::{Architecture, Triple};
#[cfg(feature = "llvm")] #[cfg(feature = "llvm")]
use roc_cli::build; use roc_cli::build;
@ -16,6 +16,14 @@ fn build(_target: &Triple, _matches: &clap::ArgMatches, _config: BuildConfig) ->
panic!("Building without LLVM is not currently supported."); panic!("Building without LLVM is not currently supported.");
} }
fn wasm32_target_tripple() -> Triple {
let mut triple = Triple::unknown();
triple.architecture = Architecture::Wasm32;
triple
}
fn main() -> io::Result<()> { fn main() -> io::Result<()> {
let matches = build_app().get_matches(); let matches = build_app().get_matches();

2
compiler/build/Cargo.toml
View file

@ -29,7 +29,7 @@ libloading = "0.6"
tempfile = "3.1.0" tempfile = "3.1.0"
serde_json = "1.0" serde_json = "1.0"
inkwell = { path = "../../vendor/inkwell", optional = true } inkwell = { path = "../../vendor/inkwell", optional = true }
target-lexicon = "0.10" target-lexicon = "0.12.2"
[dev-dependencies] [dev-dependencies]
pretty_assertions = "0.5.1" pretty_assertions = "0.5.1"

2
compiler/gen_dev/Cargo.toml
View file

@ -21,7 +21,7 @@ roc_mono = { path = "../mono" }
im = "14" # im and im-rc should always have the same version! im = "14" # im and im-rc should always have the same version!
im-rc = "14" # im and im-rc should always have the same version! im-rc = "14" # im and im-rc should always have the same version!
bumpalo = { version = "3.6.1", features = ["collections"] } bumpalo = { version = "3.6.1", features = ["collections"] }
target-lexicon = "0.10" target-lexicon = "0.12.2"
libloading = "0.6" libloading = "0.6"
object = { version = "0.24", features = ["write"] } object = { version = "0.24", features = ["write"] }

2
compiler/gen_llvm/Cargo.toml
View file

@ -21,7 +21,7 @@ im = "14" # im and im-rc should always have the same version!
im-rc = "14" # im and im-rc should always have the same version! im-rc = "14" # im and im-rc should always have the same version!
bumpalo = { version = "3.6.1", features = ["collections"] } bumpalo = { version = "3.6.1", features = ["collections"] }
inkwell = { path = "../../vendor/inkwell" } inkwell = { path = "../../vendor/inkwell" }
target-lexicon = "0.10" target-lexicon = "0.12.2"
[dev-dependencies] [dev-dependencies]
roc_can = { path = "../can" } roc_can = { path = "../can" }

2
compiler/gen_llvm/src/llvm/build.rs
View file

@ -3931,6 +3931,8 @@ pub fn get_call_conventions(cc: target_lexicon::CallingConvention) -> u32 {
SystemV => C_CALL_CONV, SystemV => C_CALL_CONV,
WasmBasicCAbi => C_CALL_CONV, WasmBasicCAbi => C_CALL_CONV,
WindowsFastcall => C_CALL_CONV, WindowsFastcall => C_CALL_CONV,
AppleAarch64 => C_CALL_CONV,
_ => C_CALL_CONV,
} }
} }

2
compiler/test_gen/Cargo.toml
View file

@ -30,7 +30,7 @@ either = "1.6.1"
indoc = "0.3.3" indoc = "0.3.3"
libc = "0.2" libc = "0.2"
inkwell = { path = "../../vendor/inkwell" } inkwell = { path = "../../vendor/inkwell" }
target-lexicon = "0.10" target-lexicon = "0.12.2"
libloading = "0.6" libloading = "0.6"
[dev-dependencies] [dev-dependencies]

2
compiler/test_mono/Cargo.toml
View file

@ -28,7 +28,7 @@ bumpalo = { version = "3.6.1", features = ["collections"] }
either = "1.6.1" either = "1.6.1"
indoc = "0.3.3" indoc = "0.3.3"
libc = "0.2" libc = "0.2"
target-lexicon = "0.10" target-lexicon = "0.12.2"
libloading = "0.6" libloading = "0.6"
[dev-dependencies] [dev-dependencies]