From cfd73cec816cb73e0017cf306e133a7b0e5ae4eb Mon Sep 17 00:00:00 2001 From: dave caruso Date: Sat, 3 Jun 2023 00:36:05 -0400 Subject: fixes with hardcoded modules (#3182) * fixes with hardcoded modules * add make hardcoded to make dev * adjust this message * remove debugging logs * this * restore2 --- src/bun.js/module_loader.zig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/bun.js/module_loader.zig') diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index eddafd5ac..f4cfe28e4 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -1724,12 +1724,13 @@ pub const ModuleLoader = struct { }; }, .@"bun:ffi" => { + const shared_library_suffix = if (Environment.isMac) "dylib" else if (Environment.isLinux) "so" else if (Environment.isWindows) "dll" else ""; return ResolvedSource{ .allocator = null, .source_code = ZigString.init( "export const FFIType=" ++ JSC.FFI.ABIType.map_to_js_object ++ - ";" ++ + ";export const suffix='" ++ shared_library_suffix ++ "';" ++ @embedFile("../js/out/modules/bun/ffi.js"), ), .specifier = ZigString.init("bun:ffi"), @@ -1773,7 +1774,7 @@ pub const ModuleLoader = struct { .@"node:wasi" => return jsResolvedSource(jsc_vm.load_builtins_from_path, .@"node:wasi", "node/wasi.js"), .@"node:zlib" => return jsResolvedSource(jsc_vm.load_builtins_from_path, .@"node:zlib", "node/zlib.js"), - .@"detect-libc" => return jsResolvedSource(jsc_vm.load_builtins_from_path, .@"detect-libc", "thirdparty/detect-libc.js"), + .@"detect-libc" => return jsResolvedSource(jsc_vm.load_builtins_from_path, .depd, if (Environment.isLinux) "thirdparty/detect-libc.linux.js" else "thirdparty/detect-libc.js"), .depd => return jsResolvedSource(jsc_vm.load_builtins_from_path, .depd, "thirdparty/depd.js"), .undici => return jsResolvedSource(jsc_vm.load_builtins_from_path, .undici, "thirdparty/undici.js"), .ws => return jsResolvedSource(jsc_vm.load_builtins_from_path, .ws, "thirdparty/ws.js"), -- cgit v1.2.3