Skip to content

Bump minimum supported macOS ABI as advertised (ABLD-28 follow-up) #41945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2025
Merged

Bump minimum supported macOS ABI as advertised (ABLD-28 follow-up) #41945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions omnibus/config/software/datadog-agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion tasks/omnibus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down