From ea3e8ad08ea4f54df018f500b63fbd8beee3f9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Desgroppes?= Date: Fri, 8 Aug 2025 11:59:50 +0200 Subject: [PATCH] Pass canonical target to `swiftc` on AArch64/ARM64 (#39641) (cherry picked from commit f92d5775a5532f4bd57b41e16ca93cdcdf0f79bc) --- omnibus/config/software/datadog-agent.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/config/software/datadog-agent.rb b/omnibus/config/software/datadog-agent.rb index 9335d0009651..4c968b0c3f72 100644 --- a/omnibus/config/software/datadog-agent.rb +++ b/omnibus/config/software/datadog-agent.rb @@ -258,7 +258,7 @@ 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-macosx11.0' : 'x86_64-apple-macosx10.10' + target = arm_target? ? 'arm64-apple-macos11.0' : 'x86_64-apple-macosx10.10' 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/"