language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

use libapp.dll as the dll name

Browse source
This commit is contained in:
Folkert 2022-10-23 20:18:09 +02:00
parent ca90b00588
commit 28665abc96
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/linker/src/generate_dylib/pe.rs
View file

@ -1,7 +1,7 @@
use object::pe; use object::pe;
use object::LittleEndian as LE; use object::LittleEndian as LE;
pub(crate) const APP_DLL: &str = "roc-cheaty-lib.dll"; pub(crate) const APP_DLL: &str = "libapp.dll";
fn synthetic_image_export_directory( fn synthetic_image_export_directory(
name: &str, name: &str,

2
crates/linker/src/lib.rs
View file

@ -55,7 +55,7 @@ pub fn build_and_preprocess_host(
exported_closure_types: Vec<String>, exported_closure_types: Vec<String>,
) { ) {
let dummy_lib = if let target_lexicon::OperatingSystem::Windows = target.operating_system { let dummy_lib = if let target_lexicon::OperatingSystem::Windows = target.operating_system {
host_input_path.with_file_name("libapp.obj") host_input_path.with_file_name("libapp.dll")
} else { } else {
host_input_path.with_file_name("libapp.so") host_input_path.with_file_name("libapp.so")
}; };

6
crates/linker/src/pe.rs
View file

@ -1727,14 +1727,14 @@ mod test {
// make the dummy dylib based on the app object // make the dummy dylib based on the app object
let names: Vec<_> = symbols.iter().map(|s| s.name.clone()).collect(); let names: Vec<_> = symbols.iter().map(|s| s.name.clone()).collect();
let dylib_bytes = crate::generate_dylib::synthetic_dll(&names); let dylib_bytes = crate::generate_dylib::synthetic_dll(&names);
std::fs::write(dir.join("libapp.obj"), dylib_bytes).unwrap(); std::fs::write(dir.join("libapp.dll"), dylib_bytes).unwrap();
// now we can compile the host (it uses libapp.obj, hence the order here) // now we can compile the host (it uses libapp.dll, hence the order here)
let output = std::process::Command::new(&zig) let output = std::process::Command::new(&zig)
.current_dir(dir) .current_dir(dir)
.args(&[ .args(&[
"build-exe", "build-exe",
"libapp.obj", "libapp.dll",
"host.zig", "host.zig",
"-lc", "-lc",
"-target", "-target",