From 16b2f93bf5e929f38c515b068fb3edf6debf2111 Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Fri, 5 Nov 2021 16:26:06 +0000 Subject: [PATCH] Remove check for macos_environment.sh - no need for it We can just do a one-liner here, if it fails, the script fails, and it should do that. Also renamed macOS_environment to all lower-case (and snake_case). Signed-off-by: Dom Rodriguez --- clean_build.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/clean_build.sh b/clean_build.sh index 9b49f565..f24079f5 100755 --- a/clean_build.sh +++ b/clean_build.sh @@ -24,12 +24,7 @@ B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=${B_BUILD_TYPE} ${B_CMAKE_FLAGS:-}" if [ "$(uname)" = "Darwin" ]; then # macOS needs a little help, so we source this environment script to fix paths. - if [ ! -e "./macOS_environment.sh" ]; then - echo "macOS environment script not found, this isn't meant to happen!" - exit 1 - else - . ./macOS_environment.sh - fi + [ -e "./macos_environment.sh" ] && . ./macos_environment.sh B_CMAKE_FLAGS="${B_CMAKE_FLAGS} -DCMAKE_OSX_SYSROOT=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9" fi