Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions makefiles/c_api_extensions/base.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ endif
### Platform Detection
#############################################

# Write the platform we are building for
platform: configure/platform.txt

# Either autodetect or use the provided value
PLATFORM_COMMAND?=
ifeq ($(DUCKDB_PLATFORM),)
Expand All @@ -79,8 +76,9 @@ else
PLATFORM_COMMAND=echo $(DUCKDB_PLATFORM) > configure/platform.txt
endif

configure/platform.txt:
@ $(PLATFORM_COMMAND)
# Write the platform we are building for
platform:
@$(PLATFORM_COMMAND)

#############################################
### Extension Version Detection
Expand Down
14 changes: 13 additions & 1 deletion makefiles/c_api_extensions/rust.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,20 @@ ifneq ($(DUCKDB_WASM_PLATFORM),)
IS_EXAMPLE=/examples
TARGET_PATH=./target/$(TARGET)
else
# Handle macOS cross-compilation
ifeq ($(DUCKDB_PLATFORM),osx_amd64)
TARGET=x86_64-apple-darwin
TARGET_INFO=--target $(TARGET)
TARGET_PATH=./target/$(TARGET)
else ifeq ($(DUCKDB_PLATFORM),osx_arm64)
TARGET=aarch64-apple-darwin
TARGET_INFO=--target $(TARGET)
TARGET_PATH=./target/$(TARGET)
else
TARGET_INFO=
TARGET_PATH=./target
endif
IS_EXAMPLE=
TARGET_PATH=./target
endif

# Rust be slightly different
Expand Down
Loading