From 26bc56f934fc11ca3e213ca2d12dc4977e42d192 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Mon, 17 Jun 2024 18:01:57 +0200 Subject: [SCons] Improve CMake and OpenSSL macOS/iOS targets Update CI to macos-12 (since macos-11 is not longer available. --- tools/cmake.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/cmake.py') diff --git a/tools/cmake.py b/tools/cmake.py index 2911011..3ab7921 100644 --- a/tools/cmake.py +++ b/tools/cmake.py @@ -49,10 +49,9 @@ def cmake_default_flags(env): config["CMAKE_OSX_ARCHITECTURES"] = '"x86_64;arm64"' else: config["CMAKE_OSX_ARCHITECTURES"] = env["arch"] - if env["macos_deployment_target"] != "default": + if env.get("macos_deployment_target", "default") != "default": config["CMAKE_OSX_DEPLOYMENT_TARGET"] = env["macos_deployment_target"] - - if env["platform"] == "macos" and sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ: + if sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ: config["CMAKE_AR"] = env["AR"] config["CMAKE_RANLIB"] = env["RANLIB"] if env["arch"] == "universal": -- cgit v1.2.3