From 3bb443f2fb4709056ef5c5c69b8103a0ddf4766d Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 5 Jul 2025 20:43:33 -0400 Subject: [PATCH 1/2] Makefile: Ensure both sides of ifeq/ifneq use the same quotes --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 212c48e78495..0eac3f762d6b 100644 --- a/Makefile +++ b/Makefile @@ -101,10 +101,10 @@ endif ifeq (${GENERATE_EXTENSION_ENTRIES}, 1) CMAKE_VARS:=${CMAKE_VARS} -DGENERATE_EXTENSION_ENTRIES=1 endif -ifneq (${ENABLE_EXTENSION_AUTOLOADING}, "") +ifneq ("${ENABLE_EXTENSION_AUTOLOADING}", "") CMAKE_VARS:=${CMAKE_VARS} -DENABLE_EXTENSION_AUTOLOADING=${ENABLE_EXTENSION_AUTOLOADING} endif -ifneq (${ENABLE_EXTENSION_AUTOINSTALL}, "") +ifneq ("${ENABLE_EXTENSION_AUTOINSTALL}", "") CMAKE_VARS:=${CMAKE_VARS} -DENABLE_EXTENSION_AUTOINSTALL=${ENABLE_EXTENSION_AUTOINSTALL} endif ifneq (${UNSAFE_NUMERIC_CAST}, ) From 5c094f3a746f15c9bb890387817b63184a90eb3d Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 5 Jul 2025 20:43:52 -0400 Subject: [PATCH 2/2] CMakeLists.txt: Use the target file to invoke duckdb_platform_binary Without this the build will fail if the user doesn't have "." in their PATH, which many users will not (especially security-conscious users). --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4956a1c2aa29..a8c5ecd0a49b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1513,7 +1513,7 @@ if(NOT DUCKDB_EXPLICIT_PLATFORM) add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/duckdb_platform_out DEPENDS duckdb_platform_binary - COMMAND duckdb_platform_binary > ${PROJECT_BINARY_DIR}/duckdb_platform_out || ( echo "Provide explicit DUCKDB_PLATFORM=your_target_arch to avoid build-type detection of the platform" && exit 1 ) + COMMAND $ > ${PROJECT_BINARY_DIR}/duckdb_platform_out || ( echo "Provide explicit DUCKDB_PLATFORM=your_target_arch to avoid build-type detection of the platform" && exit 1 ) WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ) else()