updates

mattx433 · Nov 2, 2023 · ae31f56 · ae31f56
1 parent 9827e44
commit ae31f56
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 10 deletions.
diff --git a/.github/scripts/build/aarch64-gcc b/.github/scripts/build/aarch64-gcc
@@ -5,7 +5,7 @@ export TARGET_ARCH=aarch64
 
 make ARCH=x86_64 gcc
 make ARCH=aarch64 gcc
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/cli b/.github/scripts/build/cli
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 cli
 make ARCH=aarch64 cli
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/compress b/.github/scripts/build/compress
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 compress
 make ARCH=aarch64 compress
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/cosmo-thirdparty b/.github/scripts/build/cosmo-thirdparty
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 cosmo-thirdparty
 make ARCH=aarch64 cosmo-thirdparty
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/datasette b/.github/scripts/build/datasette
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 datasette
 make ARCH=aarch64 datasette
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/editor b/.github/scripts/build/editor
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 editor
 make ARCH=aarch64 editor
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/llvm b/.github/scripts/build/llvm
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 llvm
 make ARCH=aarch64 llvm
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/pypack1 b/.github/scripts/build/pypack1
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 pypack1
 make ARCH=aarch64 pypack1
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/web b/.github/scripts/build/web
@@ -3,7 +3,7 @@ set -eux
 
 make ARCH=x86_64 web
 make ARCH=aarch64 web
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/.github/scripts/build/x86_64-gcc b/.github/scripts/build/x86_64-gcc
@@ -5,7 +5,7 @@ export TARGET_ARCH=x86_64
 
 make ARCH=x86_64 gcc
 make ARCH=aarch64 gcc
-rm -f cosmo.setup.*
+# rm -f cosmo.setup.*
 
 export MODE=
 export MODE_AARCH64=aarch64

diff --git a/git-2.42.0/minimal.diff b/git-2.42.0/minimal.diff
@@ -181,3 +181,24 @@
 
  	while (1) {
  		const char *end = strchrnul(p, ':');
+--- git-2.42.0/preload-index.c	2023-08-21 16:34:58.000000000 +0000
++++ -	2023-11-02 01:44:54.546318539 +0000
+@@ -16,6 +16,9 @@
+ #include "symlinks.h"
+ #include "trace2.h"
+
++#define _COSMO_SOURCE
++#include <stdbool.h>
++#include "libc/dce.h"
+ /*
+  * Mostly randomly chosen maximum thread counts: we
+  * cap the parallelism to 20 threads, and we want
+@@ -108,7 +111,7 @@
+ 	struct progress_data pd;
+ 	int t2_sum_lstat = 0;
+
+-	if (!HAVE_THREADS || !core_preload_index)
++	if (IsWindows() || !HAVE_THREADS || !core_preload_index)
+ 		return;
+
+ 	threads = index->cache_nr / THREAD_COST;