Skip to content

Commit 05a0fa6

Browse files
committed
fix: use cmake to compile libuv && add jit load libuv logic
1 parent f1e97be commit 05a0fa6

File tree

6 files changed

+83
-298
lines changed

6 files changed

+83
-298
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

immix

pl_linker/src/linker.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fn get_linux_lib_paths() -> Vec<String> {
103103
// fn get_libgcc_path() -> Result<String, String> {
104104
// let base_path = "/usr/lib/gcc/x86_64-linux-gnu";
105105
// let entries = std::fs::read_dir(base_path).map_err(|e| format!("Failed to read directory {}: {}", base_path, e))?;
106-
106+
107107
// for entry in entries {
108108
// let entry = entry.map_err(|e| format!("Failed to read directory entry: {}", e))?;
109109
// if entry.path().is_dir() {
@@ -115,7 +115,6 @@ fn get_linux_lib_paths() -> Vec<String> {
115115
// Err("No valid gcc version directory found".to_string())
116116
// }
117117

118-
119118
impl Linker for LdLinker {
120119
fn add_object(&mut self, path: &Path) -> Result<(), LinkerError> {
121120
let path_str = path
@@ -347,11 +346,11 @@ impl Linker for MsvcLinker {
347346
self.push_args("ntdll.lib");
348347
self.push_args("psapi.lib");
349348
self.push_args("PowrProf.lib");
350-
self.push_args("user32.lib"); // Add user32.lib
349+
self.push_args("user32.lib"); // Add user32.lib
351350
self.push_args("dbghelp.lib"); // Add dbghelp.lib
352-
self.push_args("ole32.lib"); // Add ole32.lib
351+
self.push_args("ole32.lib"); // Add ole32.lib
353352
self.push_args("shell32.lib"); // Add shell32.lib
354-
self.push_args("iphlpapi.lib");// Add iphlpapi.lib
353+
self.push_args("iphlpapi.lib"); // Add iphlpapi.lib
355354

356355
self.args.insert(0, "lld-link".to_owned());
357356
lld_rs::link(lld_rs::LldFlavor::Coff, &self.args)

vm/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ rand = "0.8"
2222

2323
[build-dependencies]
2424
cc = "1.0"
25+
cmake = "0.1"
2526

2627
[lib]
2728
name = "vm"

0 commit comments

Comments
 (0)