From 2943747add5a7c1b5074c39e6e46857121563cfc Mon Sep 17 00:00:00 2001 From: Stan Date: Thu, 19 Jan 2023 21:10:18 +0000 Subject: [PATCH] Fix FMT and NVTT not linking with the correct SDK. Tested by: @Langbart Differential Revision: https://code.wildfiregames.com/D4898 This was SVN commit r27469. --- libraries/osx/build-osx-libs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/osx/build-osx-libs.sh b/libraries/osx/build-osx-libs.sh index d80c12cd95..abb9374d6f 100755 --- a/libraries/osx/build-osx-libs.sh +++ b/libraries/osx/build-osx-libs.sh @@ -114,7 +114,7 @@ CXXFLAGS="$CXXFLAGS -arch $ARCH" LDFLAGS="$LDFLAGS -arch $ARCH" # CMake doesn't seem to pick up on architecture with CFLAGS only -CMAKE_FLAGS="-DCMAKE_OSX_ARCHITECTURES=$ARCH" +CMAKE_FLAGS="-DCMAKE_OSX_ARCHITECTURES=$ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$MIN_OSX_VERSION" JOBS=${JOBS:="-j2"} @@ -1027,7 +1027,7 @@ then -DFMT_TEST=False \ -DFMT_DOC=False \ -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \ - "$CMAKE_FLAGS" \ + $CMAKE_FLAGS \ && make fmt ${JOBS} && make install) || die "fmt build failed" popd @@ -1065,7 +1065,7 @@ then rm -f .already-built fi -CXXFLAGS="$CXXFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CMAKE_FLAGS="$CMAKE_FLAGS" JOBS="$JOBS" ./build.sh || die "Error building NVTT" +CXXFLAGS="$CXXFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CMAKE_FLAGS=$CMAKE_FLAGS JOBS="$JOBS" ./build.sh || die "Error building NVTT" popd > /dev/null