Merge pull request #1138 from Chilledheart/musl_call_no_madvise

[compatiblity] musl/openwrt: don't call madvise any more
Chilledheart · Oct 27, 2024 · 200b76e · 200b76e
2 parents c2f4082 + 47cef55
commit 200b76e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/releases-openwrt-binary.yml b/.github/workflows/releases-openwrt-binary.yml
@@ -182,10 +182,12 @@ jobs:
           rm -f *.tar.gz
       - name: Build Binary
         run: |
-          ./tools/build --variant cli --arch ${{ matrix.arch }} --system linux --subsystem openwrt --sysroot ${{ env.SDK_ROOT }} \
-            -build-benchmark -build-test -nc ${{ matrix.extra_flags }}
-          ./tools/build --variant server --arch ${{ matrix.arch }} --system linux --subsystem openwrt --sysroot ${{ env.SDK_ROOT }} \
-            -build-benchmark -build-test -nc ${{ matrix.extra_flags }}
+          ./tools/build --variant cli --arch ${{ matrix.arch }} \
+            --system linux --subsystem openwrt --sysroot ${{ env.SDK_ROOT }} \
+            -build-benchmark -build-test -use-static-build -nc ${{ matrix.extra_flags }}
+          ./tools/build --variant server --arch ${{ matrix.arch }} \
+            --system linux --subsystem openwrt --sysroot ${{ env.SDK_ROOT }} \
+            -build-benchmark -build-test -use-static-build -nc ${{ matrix.extra_flags }}
       - name: Run tests (x86 and x86_64)
         if: ${{ matrix.arch_name == 'x86' || matrix.arch_name == 'x86_64' }}
         run: |

diff --git a/third_party/boringssl/src b/third_party/boringssl/src
diff --git a/tools/build.go b/tools/build.go
@@ -1075,7 +1075,9 @@ func buildStageGenerateBuildScript() {
 			cmakeArgs = append(cmakeArgs, "-DUSE_TCMALLOC=on")
 		} else if subsystem == "musl" {
 			cmakeArgs = append(cmakeArgs, "-DUSE_TCMALLOC=off")
-			cmakeArgs = append(cmakeArgs, "-DUSE_MIMALLOC=on")
+			// mimalloc calls madvise internally while
+			// some old system doesn't like it.
+			cmakeArgs = append(cmakeArgs, "-DUSE_MIMALLOC=off")
 		} else {
 			cmakeArgs = append(cmakeArgs, "-DUSE_TCMALLOC=off")
 			cmakeArgs = append(cmakeArgs, "-DUSE_MIMALLOC=off")