From acd2cfb91fa673554f4c90dbffcfc85a0b15e274 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Mon, 18 Mar 2024 20:41:31 -0500 Subject: [PATCH] Now uses AR from OSXCROSS for MacOS builds. --- cmake/apple-darwin-common.cmake | 2 ++ toolchains.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/apple-darwin-common.cmake b/cmake/apple-darwin-common.cmake index 841b4ee..e08b0a8 100644 --- a/cmake/apple-darwin-common.cmake +++ b/cmake/apple-darwin-common.cmake @@ -53,3 +53,5 @@ set(CMAKE_INSTALL_NAME_TOOL "${OSXCROSS_TARGET_DIR}/bin/${OSXCROSS_HOST}-install set(ENV{PKG_CONFIG_LIBDIR} "${OSXCROSS_TARGET_DIR}/macports/pkgs/opt/local/lib/pkgconfig") set(ENV{PKG_CONFIG_SYSROOT_DIR} "${OSXCROSS_TARGET_DIR}/macports/pkgs") + +#link_directories(${OSXCROSS_TARGET_DIR}/darwin) diff --git a/toolchains.sh b/toolchains.sh index 49a7573..e06ab2f 100755 --- a/toolchains.sh +++ b/toolchains.sh @@ -302,7 +302,9 @@ function use_toolchain() { CC="${OSXCROSS_LOCATION}/bin/${TRIPLE}-clang" CXX="${OSXCROSS_LOCATION}/bin/${TRIPLE}-clang++" RANLIB="${OSXCROSS_LOCATION}/bin/${TRIPLE}-ranlib" + AR="${OSXCROSS_LOCATION}/bin/${TRIPLE}-ar" "${OSXCROSS_LOCATION}/bin/osxcross-conf" 2>/dev/null + echo "export AR=\"${AR}\"" echo "export OSXCROSS_LOCATION=\"${OSXCROSS_LOCATION}\"" echo "export LDFLAGS=\"-fuse-ld=${OSXCROSS_LOCATION}/bin/${TRIPLE}-ld\"" echo "export PATH=\"${OSXCROSS_LOCATION}/bin:${PATH}\""