Skip to content

Commit 627f1de

Browse files
committed
Do not build jemalloc on Windows
The jemalloc extention was recently added to JDBC builds in duckdb#133. The logic for its selection in `vendor.py` does not look fully correct to me, but both Linux and Mac are passing on CI, only Windows is breaking, so this change only tries to unbreak Windows builds, and the jemalloc selection logic can be improved in subsequent PRs.
1 parent d2c82b2 commit 627f1de

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ set(CMAKE_JAVA_COMPILE_FLAGS -source 1.8 -target 1.8 -encoding utf-8)
3232
add_definitions(-DDUCKDB_BUILD_LIBRARY)
3333

3434
if(MSVC)
35+
remove_definitions(-DDUCKDB_EXTENSION_JEMALLOC_LINKED)
3536
add_definitions(/bigobj /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
3637
else()
3738
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG ")

CMakeLists.txt.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ set(CMAKE_JAVA_COMPILE_FLAGS -source 1.8 -target 1.8 -encoding utf-8)
3232
add_definitions(-DDUCKDB_BUILD_LIBRARY)
3333

3434
if(MSVC)
35+
remove_definitions(-DDUCKDB_EXTENSION_JEMALLOC_LINKED)
3536
add_definitions(/bigobj /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
3637
else()
3738
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG ")

0 commit comments

Comments
 (0)