From 923e258bdf82d36bab7a2bce5f8bdca501a67c69 Mon Sep 17 00:00:00 2001 From: geisserml Date: Fri, 10 Nov 2023 00:59:09 +0100 Subject: [PATCH] sourcebuild: build config corrections First, note the previous change not only commented out, but accidentally swapped the value from False to True. Correct this and reland use_custom_libcxx = false by disabling partition alloc entirely in the syslibs build. Move use_allocator_shim = false to the default build (i.e. always set) to match pdfium-binaries. --- setupsrc/pypdfium2_setup/build_pdfium.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setupsrc/pypdfium2_setup/build_pdfium.py b/setupsrc/pypdfium2_setup/build_pdfium.py index 6d3f9d8ed..282d9de0f 100755 --- a/setupsrc/pypdfium2_setup/build_pdfium.py +++ b/setupsrc/pypdfium2_setup/build_pdfium.py @@ -31,7 +31,7 @@ ] -# run `gn args out/Default/ --list` for flag docs +# run `gn args out/Default/ --list` for build config docs DefaultConfig = { "is_debug": False, @@ -40,6 +40,7 @@ "pdf_enable_v8": False, "pdf_enable_xfa": False, "pdf_use_skia": False, + "use_allocator_shim": False, } SyslibsConfig = { @@ -51,13 +52,13 @@ "use_system_zlib": True, "use_system_libtiff": True, "clang_use_chrome_plugins": False, - "use_allocator_shim": False, + "pdf_use_partition_alloc": False, "use_sysroot": False, } -# if sys.platform.startswith("linux"): - # SyslibsConfig["use_custom_libcxx"] = True +if sys.platform.startswith("linux"): + SyslibsConfig["use_custom_libcxx"] = False if sys.platform.startswith("darwin"): DefaultConfig["mac_deployment_target"] = "10.13.0" SyslibsConfig["use_system_xcode"] = True