From edb872a21843ea2a776b0d3200f1bada44abd6f6 Mon Sep 17 00:00:00 2001 From: Edgar Luque Date: Mon, 11 Mar 2024 12:17:53 +0100 Subject: [PATCH] fix: fix wrong linking --- Cargo.lock | 22 +++++++++++----------- bin/edlangc/Cargo.toml | 4 ++-- edb/Cargo.toml | 4 ++-- edb/src/main.rs | 2 +- lib/edlang_ast/Cargo.toml | 4 ++-- lib/edlang_check/Cargo.toml | 8 ++++---- lib/edlang_codegen_llvm/Cargo.toml | 10 +++++----- lib/edlang_driver/Cargo.toml | 16 ++++++++-------- lib/edlang_ir/Cargo.toml | 4 ++-- lib/edlang_lowering/Cargo.toml | 6 +++--- lib/edlang_parser/Cargo.toml | 4 ++-- lib/edlang_session/Cargo.toml | 2 +- lib/edlang_span/Cargo.toml | 2 +- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 227278d8e1..accc93358e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -235,7 +235,7 @@ dependencies = [ [[package]] name = "edb" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "anyhow", "clap", @@ -248,14 +248,14 @@ dependencies = [ [[package]] name = "edlang_ast" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "edlang_span", ] [[package]] name = "edlang_check" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "ariadne", "edlang_ast", @@ -266,7 +266,7 @@ dependencies = [ [[package]] name = "edlang_codegen_llvm" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "edlang_ir", "edlang_parser", @@ -279,7 +279,7 @@ dependencies = [ [[package]] name = "edlang_driver" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "anyhow", "ariadne", @@ -300,7 +300,7 @@ dependencies = [ [[package]] name = "edlang_ir" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "edlang_span", "educe", @@ -309,7 +309,7 @@ dependencies = [ [[package]] name = "edlang_lowering" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "edlang_ast", "edlang_ir", @@ -319,7 +319,7 @@ dependencies = [ [[package]] name = "edlang_parser" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "ariadne", "edlang_ast", @@ -332,18 +332,18 @@ dependencies = [ [[package]] name = "edlang_session" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "ariadne", ] [[package]] name = "edlang_span" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" [[package]] name = "edlangc" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" dependencies = [ "edlang_driver", ] diff --git a/bin/edlangc/Cargo.toml b/bin/edlangc/Cargo.toml index 5c7a95aec6..efb87948e0 100644 --- a/bin/edlangc/Cargo.toml +++ b/bin/edlangc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlangc" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "A experimental language using LLVM." edition = "2021" @@ -14,4 +14,4 @@ repository = "https://github.com/edg-l/edlang" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -edlang_driver = { version = "0.0.1-alpha.13", path = "../../lib/edlang_driver" } +edlang_driver = { version = "0.0.1-alpha.14", path = "../../lib/edlang_driver" } diff --git a/edb/Cargo.toml b/edb/Cargo.toml index a75e371453..3649536312 100644 --- a/edb/Cargo.toml +++ b/edb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edb" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "The edlang language builder." edition = "2021" @@ -14,7 +14,7 @@ repository = "https://github.com/edg-l/edlang" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -edlang_driver = { version = "0.0.1-alpha.13", path = "../lib/edlang_driver" } +edlang_driver = { version = "0.0.1-alpha.14", path = "../lib/edlang_driver" } anyhow = "1" clap = { version = "4.4.16", features = ["derive"] } toml = "0.8.10" diff --git a/edb/src/main.rs b/edb/src/main.rs index f23bd269b4..21f884ce62 100644 --- a/edb/src/main.rs +++ b/edb/src/main.rs @@ -258,7 +258,7 @@ mod {} {{ let start = Instant::now(); let object = compile(&compile_args)?; - if has_main { + if !has_main { link_shared_lib(&[object], &output)?; } else { link_binary(&[object], &output)?; diff --git a/lib/edlang_ast/Cargo.toml b/lib/edlang_ast/Cargo.toml index b8e10bb5e8..94c11f11af 100644 --- a/lib/edlang_ast/Cargo.toml +++ b/lib/edlang_ast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_ast" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang AST" edition = "2021" @@ -13,4 +13,4 @@ repository = "https://github.com/edg-l/edlang" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -edlang_span = { version = "0.0.1-alpha.13", path = "../edlang_span" } +edlang_span = { version = "0.0.1-alpha.14", path = "../edlang_span" } diff --git a/lib/edlang_check/Cargo.toml b/lib/edlang_check/Cargo.toml index 8ee2f31664..cb4928d2d9 100644 --- a/lib/edlang_check/Cargo.toml +++ b/lib/edlang_check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_check" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang check" edition = "2021" @@ -14,7 +14,7 @@ repository = "https://github.com/edg-l/edlang" [dependencies] ariadne = { version = "0.4.0", features = ["auto-color"] } -edlang_ast = { version = "0.0.1-alpha.13", path = "../edlang_ast" } -edlang_lowering = { version = "0.0.1-alpha.13", path = "../edlang_lowering" } -edlang_session = { version = "0.0.1-alpha.13", path = "../edlang_session" } +edlang_ast = { version = "0.0.1-alpha.14", path = "../edlang_ast" } +edlang_lowering = { version = "0.0.1-alpha.14", path = "../edlang_lowering" } +edlang_session = { version = "0.0.1-alpha.14", path = "../edlang_session" } tracing = { workspace = true } diff --git a/lib/edlang_codegen_llvm/Cargo.toml b/lib/edlang_codegen_llvm/Cargo.toml index 13fa7fd941..135169a4bf 100644 --- a/lib/edlang_codegen_llvm/Cargo.toml +++ b/lib/edlang_codegen_llvm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_codegen_llvm" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang LLVM codegen" edition = "2021" @@ -13,10 +13,10 @@ repository = "https://github.com/edg-l/edlang" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -edlang_ir = { version = "0.0.1-alpha.13", path = "../edlang_ir" } -edlang_parser = { version = "0.0.1-alpha.13", path = "../edlang_parser" } -edlang_session = { version = "0.0.1-alpha.13", path = "../edlang_session" } +edlang_ir = { version = "0.0.1-alpha.14", path = "../edlang_ir" } +edlang_parser = { version = "0.0.1-alpha.14", path = "../edlang_parser" } +edlang_session = { version = "0.0.1-alpha.14", path = "../edlang_session" } llvm-sys = "170.0.1" inkwell = { git = "https://github.com/TheDan64/inkwell", rev = "e0aa2e51a6cb501e4e2a889bbea12a1efab9c4ff", features = ["llvm17-0"] } tracing = { workspace = true } -edlang_span = { version = "0.0.1-alpha.13", path = "../edlang_span" } +edlang_span = { version = "0.0.1-alpha.14", path = "../edlang_span" } diff --git a/lib/edlang_driver/Cargo.toml b/lib/edlang_driver/Cargo.toml index fcba3c1bfc..a93655f266 100644 --- a/lib/edlang_driver/Cargo.toml +++ b/lib/edlang_driver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_driver" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang compiler driver library" edition = "2021" @@ -16,13 +16,13 @@ repository = "https://github.com/edg-l/edlang" ariadne = { version = "0.4.0", features = ["auto-color"] } clap = { version = "4.4.16", features = ["derive"] } anyhow = "1" -edlang_ast = { version = "0.0.1-alpha.13", path = "../edlang_ast" } -edlang_check = { version = "0.0.1-alpha.13", path = "../edlang_check" } -edlang_codegen_llvm = { version = "0.0.1-alpha.13", path = "../edlang_codegen_llvm" } -edlang_ir = { version = "0.0.1-alpha.13", path = "../edlang_ir" } -edlang_lowering = { version = "0.0.1-alpha.13", path = "../edlang_lowering" } -edlang_parser = { version = "0.0.1-alpha.13", path = "../edlang_parser" } -edlang_session = { version = "0.0.1-alpha.13", path = "../edlang_session" } +edlang_ast = { version = "0.0.1-alpha.14", path = "../edlang_ast" } +edlang_check = { version = "0.0.1-alpha.14", path = "../edlang_check" } +edlang_codegen_llvm = { version = "0.0.1-alpha.14", path = "../edlang_codegen_llvm" } +edlang_ir = { version = "0.0.1-alpha.14", path = "../edlang_ir" } +edlang_lowering = { version = "0.0.1-alpha.14", path = "../edlang_lowering" } +edlang_parser = { version = "0.0.1-alpha.14", path = "../edlang_parser" } +edlang_session = { version = "0.0.1-alpha.14", path = "../edlang_session" } tracing = { workspace = true } tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } walkdir = "2.5.0" diff --git a/lib/edlang_ir/Cargo.toml b/lib/edlang_ir/Cargo.toml index e224c46b7d..285b0ef74f 100644 --- a/lib/edlang_ir/Cargo.toml +++ b/lib/edlang_ir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_ir" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang IR" edition = "2021" @@ -13,6 +13,6 @@ repository = "https://github.com/edg-l/edlang" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -edlang_span = { version = "0.0.1-alpha.13", path = "../edlang_span" } +edlang_span = { version = "0.0.1-alpha.14", path = "../edlang_span" } smallvec = "1.13.1" educe = "0.5.11" diff --git a/lib/edlang_lowering/Cargo.toml b/lib/edlang_lowering/Cargo.toml index da3c59e441..9449c6cbf0 100644 --- a/lib/edlang_lowering/Cargo.toml +++ b/lib/edlang_lowering/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_lowering" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang lowering" edition = "2021" @@ -13,7 +13,7 @@ repository = "https://github.com/edg-l/edlang" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -edlang_ast = { version = "0.0.1-alpha.13", path = "../edlang_ast" } -edlang_ir = { version = "0.0.1-alpha.13", path = "../edlang_ir" } +edlang_ast = { version = "0.0.1-alpha.14", path = "../edlang_ast" } +edlang_ir = { version = "0.0.1-alpha.14", path = "../edlang_ir" } tracing.workspace = true thiserror = "1.0.57" diff --git a/lib/edlang_parser/Cargo.toml b/lib/edlang_parser/Cargo.toml index 060f43f726..e16083d9fe 100644 --- a/lib/edlang_parser/Cargo.toml +++ b/lib/edlang_parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_parser" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang parser" edition = "2021" @@ -14,7 +14,7 @@ repository = "https://github.com/edg-l/edlang" [dependencies] ariadne = { version = "0.4.0", features = ["auto-color"] } -edlang_ast = { version = "0.0.1-alpha.13", path = "../edlang_ast" } +edlang_ast = { version = "0.0.1-alpha.14", path = "../edlang_ast" } itertools = "0.12.0" lalrpop-util = { version = "0.20.0", features = ["lexer"] } logos = "0.14.0" diff --git a/lib/edlang_session/Cargo.toml b/lib/edlang_session/Cargo.toml index 6688d0986b..4f24c86ca8 100644 --- a/lib/edlang_session/Cargo.toml +++ b/lib/edlang_session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_session" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang session" edition = "2021" diff --git a/lib/edlang_span/Cargo.toml b/lib/edlang_span/Cargo.toml index 6efd1cb682..967c87f14f 100644 --- a/lib/edlang_span/Cargo.toml +++ b/lib/edlang_span/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "edlang_span" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.14" authors = ["Edgar Luque "] description = "edlang span" edition = "2021"