disable building shell

duckdb · Aug 4, 2024 · ca4825f · ca4825f
1 parent 8c9dd58
commit ca4825f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -28,6 +28,7 @@ jobs:
     with:
       duckdb_version: main
       extension_name: spatial
+      build_duckdb_shell: false # Dont build the shell, doesnt work on windows due to sqlite lib conflicts
 
   duckdb-stable-deploy:
     name: Deploy extension binaries

diff --git a/Makefile b/Makefile
@@ -158,7 +158,7 @@ clean:
 
 # WASM config
 VCPKG_EMSDK_FLAGS=-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$(EMSDK)/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
-WASM_COMPILE_TIME_COMMON_FLAGS=-DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -DSKIP_EXTENSIONS="parquet;json" $(VCPKG_EMSDK_FLAGS)
+WASM_COMPILE_TIME_COMMON_FLAGS=-DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -DSKIP_EXTENSIONS="parquet;json" ${TOOLCHAIN_FLAGS} $(VCPKG_EMSDK_FLAGS)
 WASM_CXX_MVP_FLAGS=
 WASM_CXX_EH_FLAGS=$(WASM_CXX_MVP_FLAGS) -fwasm-exceptions -DWEBDB_FAST_EXCEPTIONS=1
 WASM_CXX_THREADS_FLAGS=$(WASM_COMPILE_TIME_EH_FLAGS) -DWITH_WASM_THREADS=1 -DWITH_WASM_SIMD=1 -DWITH_WASM_BULK_MEMORY=1 -pthread

diff --git a/deps/patches/zlib.patch b/deps/patches/zlib.patch
diff --git a/deps/patches/zlib_wasm.patch b/deps/patches/zlib_wasm.patch