Skip to content

Commit ff69046

Browse files
committed
Merge bitcoin/bitcoin#32215: depends: Fix cross-compiling on macOS
d0cce41 depends: Fix `mv` command compatibility with macOS (Hennadii Stepanov) 690f5da 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 bitcoin/bitcoin#32208. ACKs for top commit: janb84: ACK [d0cce41](bitcoin/bitcoin@d0cce41) fanquake: ACK d0cce41 Tree-SHA512: a224407f393cc9a90c73ce156674ec90ed74f59104849b312a993218e28f76c3f97335eed6bd5a3e552fd50002a59aa2de775d8ed7557a74c25202a638bfda8c
2 parents 4eee328 + d0cce41 commit ff69046

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

depends/packages/native_qt.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ $(package)_config_opts += -no-feature-qtplugininfo
8888

8989
$(package)_config_env := CC="$$(build_CC)"
9090
$(package)_config_env += CXX="$$(build_CXX)"
91+
ifeq ($(build_os),darwin)
92+
$(package)_config_env += OBJC="$$(build_CC)"
93+
$(package)_config_env += OBJCXX="$$(build_CXX)"
94+
endif
9195

9296
$(package)_cmake_opts := -DCMAKE_EXE_LINKER_FLAGS="$$(build_LDFLAGS)"
9397
ifneq ($(V),)
@@ -148,5 +152,5 @@ endef
148152

149153
define $(package)_postprocess_cmds
150154
rm -rf doc/ && \
151-
mv -t .. translations/
155+
mv translations/ ..
152156
endef

0 commit comments

Comments
 (0)