edg-l/edlang
1
1
Fork 0
mirror of https://github.com/edg-l/edlang.git synced 2024-11-21 23:48:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix wrong linking

Browse source
This commit is contained in:
Edgar 2024-03-11 12:17:53 +01:00
parent 2e5d9ae618
commit edb872a218
No known key found for this signature in database
GPG key ID: 70ADAE8F35904387
13 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Cargo.lock generated
View file

@ -235,7 +235,7 @@ dependencies = [
[[package]] [[package]]
name = "edb" name = "edb"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -248,14 +248,14 @@ dependencies = [
[[package]] [[package]]
name = "edlang_ast" name = "edlang_ast"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"edlang_span", "edlang_span",
] ]
[[package]] [[package]]
name = "edlang_check" name = "edlang_check"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"ariadne", "ariadne",
"edlang_ast", "edlang_ast",
@ -266,7 +266,7 @@ dependencies = [
[[package]] [[package]]
name = "edlang_codegen_llvm" name = "edlang_codegen_llvm"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"edlang_ir", "edlang_ir",
"edlang_parser", "edlang_parser",
@ -279,7 +279,7 @@ dependencies = [
[[package]] [[package]]
name = "edlang_driver" name = "edlang_driver"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ariadne", "ariadne",
@ -300,7 +300,7 @@ dependencies = [
[[package]] [[package]]
name = "edlang_ir" name = "edlang_ir"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"edlang_span", "edlang_span",
"educe", "educe",
@ -309,7 +309,7 @@ dependencies = [
[[package]] [[package]]
name = "edlang_lowering" name = "edlang_lowering"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"edlang_ast", "edlang_ast",
"edlang_ir", "edlang_ir",
@ -319,7 +319,7 @@ dependencies = [
[[package]] [[package]]
name = "edlang_parser" name = "edlang_parser"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"ariadne", "ariadne",
"edlang_ast", "edlang_ast",
@ -332,18 +332,18 @@ dependencies = [
[[package]] [[package]]
name = "edlang_session" name = "edlang_session"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"ariadne", "ariadne",
] ]
[[package]] [[package]]
name = "edlang_span" name = "edlang_span"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
[[package]] [[package]]
name = "edlangc" name = "edlangc"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
dependencies = [ dependencies = [
"edlang_driver", "edlang_driver",
] ]

4
bin/edlangc/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlangc" name = "edlangc"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "A experimental language using LLVM." description = "A experimental language using LLVM."
edition = "2021" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [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" }

4
edb/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edb" name = "edb"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "The edlang language builder." description = "The edlang language builder."
edition = "2021" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [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" anyhow = "1"
clap = { version = "4.4.16", features = ["derive"] } clap = { version = "4.4.16", features = ["derive"] }
toml = "0.8.10" toml = "0.8.10"

2
edb/src/main.rs
View file

@ -258,7 +258,7 @@ mod {} {{
let start = Instant::now(); let start = Instant::now();
let object = compile(&compile_args)?; let object = compile(&compile_args)?;
if has_main { if !has_main {
link_shared_lib(&[object], &output)?; link_shared_lib(&[object], &output)?;
} else { } else {
link_binary(&[object], &output)?; link_binary(&[object], &output)?;

4
lib/edlang_ast/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_ast" name = "edlang_ast"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang AST" description = "edlang AST"
edition = "2021" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
edlang_span = { version = "0.0.1-alpha.13", path = "../edlang_span" } edlang_span = { version = "0.0.1-alpha.14", path = "../edlang_span" }

8
lib/edlang_check/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_check" name = "edlang_check"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang check" description = "edlang check"
edition = "2021" edition = "2021"
@ -14,7 +14,7 @@ repository = "https://github.com/edg-l/edlang"
[dependencies] [dependencies]
ariadne = { version = "0.4.0", features = ["auto-color"] } 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" }
edlang_lowering = { version = "0.0.1-alpha.13", path = "../edlang_lowering" } edlang_lowering = { version = "0.0.1-alpha.14", path = "../edlang_lowering" }
edlang_session = { version = "0.0.1-alpha.13", path = "../edlang_session" } edlang_session = { version = "0.0.1-alpha.14", path = "../edlang_session" }
tracing = { workspace = true } tracing = { workspace = true }

10
lib/edlang_codegen_llvm/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_codegen_llvm" name = "edlang_codegen_llvm"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang LLVM codegen" description = "edlang LLVM codegen"
edition = "2021" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
edlang_ir = { version = "0.0.1-alpha.13", path = "../edlang_ir" } edlang_ir = { version = "0.0.1-alpha.14", path = "../edlang_ir" }
edlang_parser = { version = "0.0.1-alpha.13", path = "../edlang_parser" } edlang_parser = { version = "0.0.1-alpha.14", path = "../edlang_parser" }
edlang_session = { version = "0.0.1-alpha.13", path = "../edlang_session" } edlang_session = { version = "0.0.1-alpha.14", path = "../edlang_session" }
llvm-sys = "170.0.1" llvm-sys = "170.0.1"
inkwell = { git = "https://github.com/TheDan64/inkwell", rev = "e0aa2e51a6cb501e4e2a889bbea12a1efab9c4ff", features = ["llvm17-0"] } inkwell = { git = "https://github.com/TheDan64/inkwell", rev = "e0aa2e51a6cb501e4e2a889bbea12a1efab9c4ff", features = ["llvm17-0"] }
tracing = { workspace = true } 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" }

16
lib/edlang_driver/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_driver" name = "edlang_driver"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang compiler driver library" description = "edlang compiler driver library"
edition = "2021" edition = "2021"
@ -16,13 +16,13 @@ repository = "https://github.com/edg-l/edlang"
ariadne = { version = "0.4.0", features = ["auto-color"] } ariadne = { version = "0.4.0", features = ["auto-color"] }
clap = { version = "4.4.16", features = ["derive"] } clap = { version = "4.4.16", features = ["derive"] }
anyhow = "1" anyhow = "1"
edlang_ast = { version = "0.0.1-alpha.13", path = "../edlang_ast" } edlang_ast = { version = "0.0.1-alpha.14", path = "../edlang_ast" }
edlang_check = { version = "0.0.1-alpha.13", path = "../edlang_check" } edlang_check = { version = "0.0.1-alpha.14", path = "../edlang_check" }
edlang_codegen_llvm = { version = "0.0.1-alpha.13", path = "../edlang_codegen_llvm" } edlang_codegen_llvm = { version = "0.0.1-alpha.14", path = "../edlang_codegen_llvm" }
edlang_ir = { version = "0.0.1-alpha.13", path = "../edlang_ir" } edlang_ir = { version = "0.0.1-alpha.14", path = "../edlang_ir" }
edlang_lowering = { version = "0.0.1-alpha.13", path = "../edlang_lowering" } edlang_lowering = { version = "0.0.1-alpha.14", path = "../edlang_lowering" }
edlang_parser = { version = "0.0.1-alpha.13", path = "../edlang_parser" } edlang_parser = { version = "0.0.1-alpha.14", path = "../edlang_parser" }
edlang_session = { version = "0.0.1-alpha.13", path = "../edlang_session" } edlang_session = { version = "0.0.1-alpha.14", path = "../edlang_session" }
tracing = { workspace = true } tracing = { workspace = true }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
walkdir = "2.5.0" walkdir = "2.5.0"

4
lib/edlang_ir/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_ir" name = "edlang_ir"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang IR" description = "edlang IR"
edition = "2021" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [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" smallvec = "1.13.1"
educe = "0.5.11" educe = "0.5.11"

6
lib/edlang_lowering/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_lowering" name = "edlang_lowering"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang lowering" description = "edlang lowering"
edition = "2021" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
edlang_ast = { version = "0.0.1-alpha.13", path = "../edlang_ast" } edlang_ast = { version = "0.0.1-alpha.14", path = "../edlang_ast" }
edlang_ir = { version = "0.0.1-alpha.13", path = "../edlang_ir" } edlang_ir = { version = "0.0.1-alpha.14", path = "../edlang_ir" }
tracing.workspace = true tracing.workspace = true
thiserror = "1.0.57" thiserror = "1.0.57"

4
lib/edlang_parser/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_parser" name = "edlang_parser"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang parser" description = "edlang parser"
edition = "2021" edition = "2021"
@ -14,7 +14,7 @@ repository = "https://github.com/edg-l/edlang"
[dependencies] [dependencies]
ariadne = { version = "0.4.0", features = ["auto-color"] } 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" itertools = "0.12.0"
lalrpop-util = { version = "0.20.0", features = ["lexer"] } lalrpop-util = { version = "0.20.0", features = ["lexer"] }
logos = "0.14.0" logos = "0.14.0"

2
lib/edlang_session/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_session" name = "edlang_session"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang session" description = "edlang session"
edition = "2021" edition = "2021"

2
lib/edlang_span/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "edlang_span" name = "edlang_span"
version = "0.0.1-alpha.13" version = "0.0.1-alpha.14"
authors = ["Edgar Luque <edgar@edgarluque.com>"] authors = ["Edgar Luque <edgar@edgarluque.com>"]
description = "edlang span" description = "edlang span"
edition = "2021" edition = "2021"