mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Jarred Sumner
2025-01-02 16:22:58 -08:00
parent 012d70f42e
commit 4dcfd686b4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compile_target.zig
View File

@@ -120,7 +120,7 @@ pub fn exePath(this: *const CompileTarget, buf: *bun.PathBuffer, version_str: [:
bun.fs.FileSystem.instance.top_level_dir,
buf,
&.{
bun.install.PackageManager.fetchCacheDirectoryPath(env).path,
bun.install.PackageManager.fetchCacheDirectoryPath(env, null).path,
version_str,
},
.auto,

11
src/install/install.zig
View File

@@ -3533,7 +3533,7 @@ pub const PackageManager = struct {
noinline fn ensureCacheDirectory(this: *PackageManager) std.fs.Dir {
loop: while (true) {
if (this.options.enable.cache) {
const cache_dir = fetchCacheDirectoryPath(this.env, this.options);
const cache_dir = fetchCacheDirectoryPath(this.env, &this.options);
this.cache_directory_path = this.allocator.dupeZ(u8, cache_dir.path) catch bun.outOfMemory();
return std.fs.cwd().makeOpenPath(cache_dir.path, .{}) catch {
@@ -6234,7 +6234,7 @@ pub const PackageManager = struct {
}
const CacheDir = struct { path: string, is_node_modules: bool };
pub fn fetchCacheDirectoryPath(env: *DotEnv.Loader, options: *Options) CacheDir {
pub fn fetchCacheDirectoryPath(env: *DotEnv.Loader, options: ?*const Options) CacheDir {
if (env.get("BUN_INSTALL_CACHE_DIR")) |dir| {
return CacheDir{ .path = Fs.FileSystem.instance.abs(&[_]string{dir}), .is_node_modules = false };
}
@@ -6243,9 +6243,10 @@ pub const PackageManager = struct {
var parts = [_]string{ dir, "install/", "cache/" };
return CacheDir{ .path = Fs.FileSystem.instance.abs(&parts), .is_node_modules = false };
}
if (options.cache_directory) |dir| {
return CacheDir{ .path = Fs.FileSystem.instance.abs(&[_]string{dir}), .is_node_modules = false };
if (options) |opts| {
if (opts.cache_directory.len > 0) {
return CacheDir{ .path = Fs.FileSystem.instance.abs(&[_]string{opts.cache_directory}), .is_node_modules = false };
}
}
if (env.get("XDG_CACHE_HOME")) |dir| {