From 3ecf0b59adf10774a0b557910550373ad776c285 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Thu, 5 Jan 2023 20:50:23 -0600 Subject: [PATCH] Tabs cleaned up. --- targets/Linux.target | 4 ++-- targets/MacOS.target | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/targets/Linux.target b/targets/Linux.target index 85df768..319b5db 100644 --- a/targets/Linux.target +++ b/targets/Linux.target @@ -57,9 +57,9 @@ function buildJoeyLib() { export CFLAGS="-DJOEY_DEBUG ${CFLAGS}" fi - setCompiler + setCompiler ${ARCH} ${PASS} buildJoeyLibSDL2 - unSetCompiler + unSetCompiler } diff --git a/targets/MacOS.target b/targets/MacOS.target index 5eab820..0cf9beb 100644 --- a/targets/MacOS.target +++ b/targets/MacOS.target @@ -76,13 +76,13 @@ function buildMacOSXToolchain() { fi cp -f "../${SDK}" tarballs/. if [[ ! -f ../cross/${PLATFORM}/toolchain.cmake ]]; then - UNATTENDED=1 ./build.sh - tSudo ENABLE_COMPILER_RT_INSTALL=1 ./build_compiler_rt.sh - mkdir -p ../cross/${PLATFORM} - mv -f target/* ../cross/${PLATFORM} - tSudo mv -f /usr/lib/llvm-10/lib/clang/10.0.0/lib/darwin ../cross/${PLATFORM}/. - ./cleanup.sh - fi + UNATTENDED=1 ./build.sh + tSudo ENABLE_COMPILER_RT_INSTALL=1 ./build_compiler_rt.sh + mkdir -p ../cross/${PLATFORM} + mv -f target/* ../cross/${PLATFORM} + tSudo mv -f /usr/lib/llvm-10/lib/clang/10.0.0/lib/darwin ../cross/${PLATFORM}/. + ./cleanup.sh + fi popd } @@ -96,17 +96,17 @@ function install() { local ARCH=$1 local PASS=$2 - if [[ "${ARCH}" == "aarch64" ]]; then - buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_11_3}" "${AUTOMATED_XCODE_12_5_1_XIP}" macos-apple - SDL2_TAG=97a5e744497ff7cc93edc5119d67cad3ee86dd57 - else - buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_10_13}" "${AUTOMATED_XCODE_9_4_1_XIP}" macos-intel - SDL2_TAG=25f9ed87ff6947d9576fc9d79dee0784e638ac58 - fi + if [[ "${ARCH}" == "aarch64" ]]; then + buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_11_3}" "${AUTOMATED_XCODE_12_5_1_XIP}" macos-apple + SDL2_TAG=97a5e744497ff7cc93edc5119d67cad3ee86dd57 + else + buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_10_13}" "${AUTOMATED_XCODE_9_4_1_XIP}" macos-intel + SDL2_TAG=25f9ed87ff6947d9576fc9d79dee0784e638ac58 + fi - setCompiler ${ARCH} ${PASS} - buildSDL2 ${SDL2_TAG} ${M_TRIPLE} - unSetCompiler + setCompiler ${ARCH} ${PASS} + buildSDL2 ${SDL2_TAG} ${M_TRIPLE} + unSetCompiler }