From 690f5da15a1e368b9ada6f14c6dc15d70dfab2f9 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 3 Apr 2025 19:03:27 +0100 Subject: [PATCH 1/2] depends: Specify Objective C/C++ compilers for `native_qt` package This change fixes cross-compilation from macOS to macOS with another architecture. --- depends/packages/native_qt.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/depends/packages/native_qt.mk b/depends/packages/native_qt.mk index d4f41bf58f1..e63fac72474 100644 --- a/depends/packages/native_qt.mk +++ b/depends/packages/native_qt.mk @@ -88,6 +88,10 @@ $(package)_config_opts += -no-feature-qtplugininfo $(package)_config_env := CC="$$(build_CC)" $(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)" ifneq ($(V),) From d0cce4172c041fc9b2910b360fe496b1102b19d2 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 3 Apr 2025 19:03:52 +0100 Subject: [PATCH 2/2] depends: Fix `mv` command compatibility with macOS --- depends/packages/native_qt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/native_qt.mk b/depends/packages/native_qt.mk index e63fac72474..fc59c4d3ccf 100644 --- a/depends/packages/native_qt.mk +++ b/depends/packages/native_qt.mk @@ -152,5 +152,5 @@ endef define $(package)_postprocess_cmds rm -rf doc/ && \ - mv -t .. translations/ + mv translations/ .. endef