From f9dcfa089cff22e2368395e05558f26f5a085eb2 Mon Sep 17 00:00:00 2001
From: dpuzyrkov <dpuzyrkov@gmail.com>
Date: Fri, 26 Aug 2022 16:51:42 +0300
Subject: [PATCH] [*] osxcross target fix.
---
targets/osx.sh | 33 ++++++++-------------------------
1 file changed, 8 insertions(+), 25 deletions(-)
diff --git a/targets/osx.sh b/targets/osx.sh
index cd68374..328b076 100644
--- a/targets/osx.sh
+++ b/targets/osx.sh
@@ -30,32 +30,15 @@ echo "Using QT ${OSXCROSS_QT_VERSION} from ${OSXCROSS_QT_ROOT}/${OSXCROSS_QT_VER
[ ! -d ${OSXCROSS_QT_ROOT}/${OSXCROSS_QT_VERSION} ] && { echo "No QT ${OSXCROSS_QT_VERSION} found in ${OSXCROSS_QT_ROOT}" && exit 255; }
-#define QMAKE & MAKE commands for build.sh script
-export OSXCROSS_VERSION=1.4
-export OSXCROSS_OSX_VERSION_MIN=10.9
-export OSXCROSS_TARGET=darwin20.4
-export OSXCROSS_BASE_DIR=/osxcross/build/..
-export OSXCROSS_SDK=/opt/osxcross/bin/../SDK/MacOSX11.3.sdk
-export OSXCROSS_SDK_DIR=/opt/osxcross/bin/../SDK/MacOSX11.3.sdk/..
-export OSXCROSS_SDK_VERSION=11.3
-export OSXCROSS_TARBALL_DIR=/osxcross/build/../tarballs
-export OSXCROSS_PATCH_DIR=/osxcross/build/../patches
-export OSXCROSS_TARGET_DIR=/opt/osxcross/bin/..
-export OSXCROSS_DIR_SDK_TOOLS=/opt/osxcross/bin/../SDK/MacOSX11.3.sdk/../tools
-export OSXCROSS_BUILD_DIR=/osxcross/build
-export OSXCROSS_CCTOOLS_PATH=/opt/osxcross/bin
-export OSXCROSS_LIBLTO_PATH=/usr/lib/llvm-11/lib
-export OSXCROSS_LINKER_VERSION=609
-export PATH=/opt/osxcross//bin:/opt/osxcross//bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/osxcross/bin
-
-export CC=${OSXCROSS_ROOT}/bin/x86_64-apple-darwin20.4-clang
-export CXX=${OSXCROSS_ROOT}bin/x86_64-apple-darwin20.4-clang++
-
-CMAKE=(cmake)
-
-#everything else can be done by default make
+$(${OSXCROSS_ROOT}/bin/osxcross-conf)
+
+
+export OSXCROSS_HOST=x86_64-apple-darwin20.4
+CMAKE=(cmake -DCMAKE_TOOLCHAIN_FILE=${OSXCROSS_ROOT}/toolchain.cmake)
+
+##everything else can be done by default make
MAKE=(make)
echo "OSXcross target"
-echo "QMAKE=${CMAKE[@]}"
+echo "CMAKE=${CMAKE[@]}"
echo "MAKE=${MAKE[@]}"
\ No newline at end of file
--
GitLab