phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 06:49:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#32215: depends: Fix cross-compiling on macOS

Browse source 
d0cce4172c depends: Fix `mv` command compatibility with macOS (Hennadii Stepanov)
690f5da15a depends: Specify Objective C/C++ compilers for `native_qt` package (Hennadii Stepanov)

Pull request description:

  This PR:
  1. Specifies Objective C/C++ compilers for `native_qt` package.
  2. Removes the `-t` option, which is incompatible with `mv` on macOS.

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

ACKs for top commit:
  janb84:
    ACK [d0cce41](d0cce4172c)
  fanquake:
    ACK d0cce4172c

Tree-SHA512: a224407f393cc9a90c73ce156674ec90ed74f59104849b312a993218e28f76c3f97335eed6bd5a3e552fd50002a59aa2de775d8ed7557a74c25202a638bfda8c
This commit is contained in:
merge-script 2025-04-25 10:15:04 +01:00
commit ff69046e66
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
depends/packages/native_qt.mk
View file

@ -88,6 +88,10 @@ $(package)_config_opts += -no-feature-qtplugininfo
$(package)_config_env := CC="$$(build_CC)" $(package)_config_env := CC="$$(build_CC)"
$(package)_config_env += CXX="$$(build_CXX)" $(package)_config_env += CXX="$$(build_CXX)"
ifeq ($(build_os),darwin)
$(package)_config_env += OBJC="$$(build_CC)"
$(package)_config_env += OBJCXX="$$(build_CXX)"
endif
$(package)_cmake_opts := -DCMAKE_EXE_LINKER_FLAGS="$$(build_LDFLAGS)" $(package)_cmake_opts := -DCMAKE_EXE_LINKER_FLAGS="$$(build_LDFLAGS)"
ifneq ($(V),) ifneq ($(V),)
@ -148,5 +152,5 @@ endef
define $(package)_postprocess_cmds define $(package)_postprocess_cmds
rm -rf doc/ && \ rm -rf doc/ && \
mv -t .. translations/ mv translations/ ..
endef endef