From 8b74b7dcdddd805edea23c3950aaeed1bafefe50 Mon Sep 17 00:00:00 2001 From: Jonathan Schwender Date: Wed, 9 Jul 2025 17:38:21 +0800 Subject: [PATCH 1/2] WIP: jemalloc Signed-off-by: Jonathan Schwender --- mozjs-sys/Cargo.toml | 2 +- mozjs-sys/makefile.cargo | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mozjs-sys/Cargo.toml b/mozjs-sys/Cargo.toml index cdec66750e..897cd2fd27 100644 --- a/mozjs-sys/Cargo.toml +++ b/mozjs-sys/Cargo.toml @@ -2,7 +2,7 @@ name = "mozjs_sys" description = "System crate for the Mozilla SpiderMonkey JavaScript engine." repository.workspace = true -version = "0.128.13-0" +version = "0.128.13-1" authors = ["Mozilla"] links = "mozjs" license.workspace = true diff --git a/mozjs-sys/makefile.cargo b/mozjs-sys/makefile.cargo index f96ff430f7..7406c5d144 100644 --- a/mozjs-sys/makefile.cargo +++ b/mozjs-sys/makefile.cargo @@ -4,7 +4,6 @@ SHELL := bash # Default flags CONFIGURE_FLAGS := \ - --disable-jemalloc \ --disable-js-shell \ --disable-tests \ --disable-export-js \ From a5c764fd54d9c293a67b17e738aebe27b8575fea Mon Sep 17 00:00:00 2001 From: Jonathan Schwender Date: Wed, 9 Jul 2025 19:01:59 +0800 Subject: [PATCH 2/2] WIP: jemalloc by default on Linux, darwin, windows Signed-off-by: Jonathan Schwender --- mozjs-sys/mozjs/build/moz.configure/memory.configure | 4 ++-- mozjs-sys/mozjs/mozglue/build/moz.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozjs-sys/mozjs/build/moz.configure/memory.configure b/mozjs-sys/mozjs/build/moz.configure/memory.configure index f2ff727cbf..e9c080fb1e 100644 --- a/mozjs-sys/mozjs/build/moz.configure/memory.configure +++ b/mozjs-sys/mozjs/build/moz.configure/memory.configure @@ -7,8 +7,8 @@ @depends(target, js_package) def jemalloc_default(target, js_package): - if js_package: - return False + # if js_package: + # return False return target.kernel in ("Darwin", "Linux", "WINNT") diff --git a/mozjs-sys/mozjs/mozglue/build/moz.build b/mozjs-sys/mozjs/mozglue/build/moz.build index f982f7dc49..a89a0d8cb6 100644 --- a/mozjs-sys/mozjs/mozglue/build/moz.build +++ b/mozjs-sys/mozjs/mozglue/build/moz.build @@ -10,7 +10,7 @@ if CONFIG["JS_STANDALONE"] and not CONFIG["MOZ_MEMORY"]: Library("mozglue") elif CONFIG["OS_TARGET"] in ("WINNT", "Darwin", "Android"): - SharedLibrary("mozglue") + Library("mozglue") else: Library("mozglue")