Skip to content

Commit 00e2265

Browse files
committed
Use external cmake to point to extensions to be built
1 parent 175dd23 commit 00e2265

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,6 @@ jobs:
510510
511511
- name: Build Wasm module
512512
run: |
513-
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
514513
DUCKDB_PLATFORM="wasm_mvp" DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize mvp
515514
516515
- name: Upload artifact
@@ -554,7 +553,6 @@ jobs:
554553
555554
- name: Build Wasm module
556555
run: |
557-
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
558556
DUCKDB_PLATFORM="wasm_eh" DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize eh
559557
560558
- name: Upload artifact
@@ -598,7 +596,6 @@ jobs:
598596
599597
- name: Build Wasm module
600598
run: |
601-
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
602599
DUCKDB_PLATFORM="wasm_threads" DUCKDB_WASM_LOADABLE_EXTENSIONS="signed" GEN=ninja ./scripts/wasm_build_lib.sh relsize coi
603600
604601
- name: Upload artifact

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ app: wasm wasmpack shell docs js_tests_release
357357
yarn workspace @duckdb/duckdb-wasm-app build:release
358358

359359
build_loadable:
360-
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
361360
DUCKDB_PLATFORM=wasm_${TARGET} DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize ${TARGET}
362361

363362
build_loadable_unsigned: build_loadable
File renamed without changes.

scripts/wasm_build_lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ emcmake cmake \
6161
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
6262
-DDUCKDB_LOCATION=${DUCKDB_LOCATION} \
6363
-DWASM_LINK_FLAGS_EXT="${LINK_FLAGS}" \
64+
-DDUCKDB_EXTENSION_CONFIGS=extension_config_wasm.cmake \
6465
${ADDITIONAL_FLAGS}
6566

6667
emmake make \

0 commit comments

Comments
 (0)