highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-06 13:47:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#34878: depends: Fix cross-compiling on macOS for Windows

Browse Source 
7a9304f887 depends: Fix cross-compiling on macOS for Windows (Hennadii Stepanov)

Pull request description:

  1. Use `build_os` instead of `host_os` for native packages.

  2. `XCODE_VERSION` is available only for `darwin` hosts. Therefore, simply disable the Xcode version check for `native_qt`.

  Fixes https://github.com/bitcoin/bitcoin/issues/34874.

ACKs for top commit:
  fanquake:
    ACK 7a9304f887

Tree-SHA512: ef3349de19f3cdb6f445d44f8650815ded5dbe359faafc02941b2f2f0296905aaaac67a4916372b17de58bebabcbcdcbc21af6fe255ebb8f4cdfab00ff257602
This commit is contained in:
merge-script
2026-03-23 07:45:38 +08:00
parent 999c42484f 7a9304f887
commit 559df68240
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
depends/packages/native_qt.mk
View File

@@ -97,9 +97,9 @@ ifneq ($(V),)
$(package)_cmake_opts += --log-level=STATUS
endif
ifeq ($(host_os),darwin)
$(package)_cmake_opts += -DQT_INTERNAL_XCODE_VERSION=$(XCODE_VERSION)
ifeq ($(build_os),darwin)
$(package)_cmake_opts += -DQT_NO_APPLE_SDK_MAX_VERSION_CHECK=ON
$(package)_cmake_opts += -DQT_NO_XCODE_MIN_VERSION_CHECK=ON
endif
endef