diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /databases/clickhouse/files/patch-PreLoad.cmake | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'databases/clickhouse/files/patch-PreLoad.cmake')
| -rw-r--r-- | databases/clickhouse/files/patch-PreLoad.cmake | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/databases/clickhouse/files/patch-PreLoad.cmake b/databases/clickhouse/files/patch-PreLoad.cmake new file mode 100644 index 000000000000..de1b05af5747 --- /dev/null +++ b/databases/clickhouse/files/patch-PreLoad.cmake @@ -0,0 +1,46 @@ +--- PreLoad.cmake.orig 2024-09-26 19:15:26 UTC ++++ PreLoad.cmake +@@ -15,12 +15,24 @@ endif() + endif () + endif() + ++# Default toolchain - this is needed to avoid dependency on OS files. ++execute_process(COMMAND uname -s ++ OUTPUT_VARIABLE OS ++ COMMAND_ERROR_IS_FATAL ANY ++) ++execute_process(COMMAND uname -m ++ OUTPUT_VARIABLE ARCH ++ COMMAND_ERROR_IS_FATAL ANY ++) ++ ++ + # Check if environment is polluted. +-if (NOT "$ENV{CFLAGS}" STREQUAL "" ++if ((OS MATCHES "Linux") AND (NOT "$ENV{CFLAGS}" STREQUAL "" + OR NOT "$ENV{CXXFLAGS}" STREQUAL "" + OR NOT "$ENV{LDFLAGS}" STREQUAL "" + OR CMAKE_C_FLAGS OR CMAKE_CXX_FLAGS OR CMAKE_EXE_LINKER_FLAGS OR CMAKE_MODULE_LINKER_FLAGS +- OR CMAKE_C_FLAGS_INIT OR CMAKE_CXX_FLAGS_INIT OR CMAKE_EXE_LINKER_FLAGS_INIT OR CMAKE_MODULE_LINKER_FLAGS_INIT) ++ OR CMAKE_C_FLAGS_INIT OR CMAKE_CXX_FLAGS_INIT ++ OR CMAKE_EXE_LINKER_FLAGS_INIT OR CMAKE_MODULE_LINKER_FLAGS_INIT)) + + # if $ENV + message("CFLAGS: $ENV{CFLAGS}") +@@ -49,16 +61,6 @@ endif() + + Note: if you don't like this behavior, you can manually edit the cmake files, but please don't complain to developers.") + endif() +- +-# Default toolchain - this is needed to avoid dependency on OS files. +-execute_process(COMMAND uname -s +- OUTPUT_VARIABLE OS +- COMMAND_ERROR_IS_FATAL ANY +-) +-execute_process(COMMAND uname -m +- OUTPUT_VARIABLE ARCH +- COMMAND_ERROR_IS_FATAL ANY +-) + + # By default, prefer clang on Linux + # But note, that you still may change the compiler with -DCMAKE_C_COMPILER/-DCMAKE_CXX_COMPILER. |