diff --git a/omnibus/config/software/datadog-agent.rb b/omnibus/config/software/datadog-agent.rb index 2fde65c2320440..f1ebd818006857 100644 --- a/omnibus/config/software/datadog-agent.rb +++ b/omnibus/config/software/datadog-agent.rb @@ -269,9 +269,8 @@ app_temp_dir = "#{install_dir}/Datadog Agent.app/Contents" mkdir "#{app_temp_dir}/MacOS" systray_build_dir = "#{project_dir}/comp/core/gui/guiimpl/systray" - # Target OSX 10.10 (it brings significant changes to Cocoa and Foundation APIs, and older versions of OSX are EOL'ed) # Add @executable_path/../Frameworks to rpath to find the swift libs in the Frameworks folder. - target = arm_target? ? 'arm64-apple-macos11.0' : 'x86_64-apple-macosx10.10' + target = "#{arm_target? ? 'arm64' : 'x86_64'}-apple-macos11.0" # https://docs.datadoghq.com/agent/supported_platforms/?tab=macos command "swiftc -O -swift-version \"5\" -target \"#{target}\" -Xlinker '-rpath' -Xlinker '@executable_path/../Frameworks' Sources/*.swift -o gui", cwd: systray_build_dir copy "#{systray_build_dir}/gui", "#{app_temp_dir}/MacOS/" copy "#{systray_build_dir}/agent.png", "#{app_temp_dir}/MacOS/" diff --git a/tasks/omnibus.py b/tasks/omnibus.py index bacaf9682399c6..4f45ae629c073d 100644 --- a/tasks/omnibus.py +++ b/tasks/omnibus.py @@ -139,7 +139,7 @@ def get_omnibus_env( env[key] = sha1 if sys.platform == 'darwin': - env['MACOSX_DEPLOYMENT_TARGET'] = '11.0' if os.uname().machine == "arm64" else '10.12' + env['MACOSX_DEPLOYMENT_TARGET'] = '11.0' # https://docs.datadoghq.com/agent/supported_platforms/?tab=macos if skip_sign: env['SKIP_SIGN_MAC'] = 'true'