Skip to content

Commit

Permalink
adding linker flags to GA
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugoberry committed Apr 2, 2024
1 parent 375642e commit 5f8f133
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/workflows/_extension_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
duckdb_version:
required: true
type: string
default: "linux_amd64;linux_amd64_gcc4;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;linux_arm64;osx_amd64;windows_amd64_rtools"
# ';' separated list of architectures to exclude, for example: 'linux_amd64;osx_arm64'
exclude_archs:
required: false
Expand Down Expand Up @@ -305,6 +306,10 @@ jobs:
cp $OVERLAY_TRIPLET_SRC $OVERLAY_TRIPLET_DST
echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38")" >> $OVERLAY_TRIPLET_DST
- name: Set linker flags for MSVC
run: |
echo "EXT_RELEASE_FLAGS=-DCMAKE_EXE_LINKER_FLAGS='/FORCE:MULTIPLE' -DCMAKE_SHARED_LINKER_FLAGS='/FORCE:MULTIPLE'" >> $GITHUB_ENV
- name: Build & test extension
env:
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/overlay_triplets"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ EXT_CONFIG=${PROJ_DIR}extension_config.cmake
# export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux/share/kaitai-struct-cpp-stl-runtime:${CMAKE_PREFIX_PATH}
# export kaitai-struct-cpp-stl-runtime_DIR := /workspaces/duckdb-pbix-extension/build/release/vcpkg_installed/x64-linux/share/kaitai-struct-cpp-stl-runtime

VCPKG_TOOLCHAIN_FILE=/workspaces/duckdb-pbix-extension/vcpkg/scripts/buildsystems/vcpkg.cmake
# VCPKG_TOOLCHAIN_FILE=/workspaces/duckdb-pbix-extension/vcpkg/scripts/buildsystems/vcpkg.cmake


# Include the Makefile from extension-ci-tools
Expand Down

0 comments on commit 5f8f133

Please sign in to comment.