Add mimalloc to updateLibs and fix Dockerfile (envoyproxy#57)

arminabf · Oct 25, 2022 · b1759b1 · b1759b1
1 parent 1d09e73
commit b1759b1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/buildtools/mimalloc/Dockerfile b/buildtools/mimalloc/Dockerfile
@@ -9,6 +9,6 @@ RUN mkdir -p /mimalloc && curl -L https://github.com/microsoft/mimalloc/archive/
 WORKDIR /mimalloc
 ADD mimalloc.patch mimalloc.patch
 RUN patch -p1 < mimalloc.patch
-RUN mkdir -p out/release && cd out/release && cmake ../.. -DMI_BUILD_SHARED=off -DMI_BUILD_TESTS=off && make && llvm-ranlib-14 libmimalloc.a
+RUN mkdir -p out/release && cd out/release && cmake ../.. -DMI_BUILD_SHARED=off -DMI_BUILD_TESTS=off && make && ${RANLIB} libmimalloc.a
 
 CMD ["cp", "./out/release/libmimalloc.a", "/out/libmimalloc.a"]
diff --git a/lib/libmimalloc.a b/lib/libmimalloc.a
diff --git a/magefile.go b/magefile.go
@@ -206,7 +206,7 @@ tinygo build -gc=none -opt=2 -o %s -scheduler=none -target=wasi %s`, filepath.Jo
 
 // UpdateLibs updates the C++ filter dependencies.
 func UpdateLibs() error {
-	libs := []string{"aho-corasick", "libinjection", "re2"}
+	libs := []string{"aho-corasick", "libinjection", "mimalloc", "re2"}
 	for _, lib := range libs {
 		if err := sh.RunV("docker", "build", "-t", "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-"+lib, filepath.Join("buildtools", lib)); err != nil {
 			return err