Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DuckDB build for macOS ARM and 32-bit #3115

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Fix DuckDB build for macOS ARM and 32-bit #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-extensions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:

- name: Install OpenSSL
run: |
brew install openssl@3
brew install openssl@3 duckdb
OPENSSL_ROOT=$(readlink -f /opt/homebrew/Cellar/openssl@3/*/)
echo "OPENSSL_ROOT_DIR=$OPENSSL_ROOT" >> $GITHUB_ENV

Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
message(STATUS "32-bit architecture detected")
add_compile_definitions(__32BIT__)
set(__32BIT__ TRUE)
endif()

if(NOT CMAKE_BUILD_TYPE)
Expand Down
6 changes: 5 additions & 1 deletion extension/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ if("httpfs" IN_LIST BUILD_EXTENSIONS)
endif()

if ("duckdb_scanner" IN_LIST BUILD_EXTENSIONS)
add_subdirectory(duckdb_scanner)
if(NOT __32BIT__)
# DuckDB does not officially support 32-bit builds, so we disable the
# extension for 32-bit builds
add_subdirectory(duckdb_scanner)
endif()
endif()

if (${BUILD_EXTENSION_TESTS})
Expand Down
Loading