diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index b2ea4aee..1c780548 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -17,7 +17,7 @@ jobs: uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.5.5 with: ci_tools_version: v1.5.5 - duckdb_version: v1.5.5 + duckdb_version: fc4002c6e36f1e2d17d7c5b1a604777d69238d2b extension_name: vortex exclude_archs: "wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;windows_amd64;linux_amd64_musl" extra_toolchains: "rust" diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b211813..62be87ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,11 @@ cmake_policy(SET CMP0135 NEW) set(TARGET_NAME vortex) project(${TARGET_NAME}_project) +set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0) +if(UNIX AND NOT APPLE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftls-model=global-dynamic") +endif() + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/duckdb b/duckdb index d8cdaa33..fc4002c6 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit d8cdaa33fda8df955cc76ef58a280f68f4cd43fa +Subproject commit fc4002c6e36f1e2d17d7c5b1a604777d69238d2b