Merge pull request #60 from swiftlang/automerge/merge-main-2025-05-27_16-54

Merge `main` into `release/6.2`

Author: parkera

.github/workflows/automerge.yml

@@ -0,0 +1,17 @@
+name: Create PR to merge main into release branch
+# In the first period after branching the release branch, we typically want to include many changes from `main` in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.
+# Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+on:
+  schedule:
+    - cron: '0 9 * * MON'
+  workflow_dispatch:
+jobs:
+  create_merge_pr:
+    name: Create PR to merge main into release branch
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    with:
+      base_branch: release/6.2
+    permissions:
+      contents: write
+      pull-requests: write
+    if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-foundation-icu') || (github.event_name != 'schedule')  # Ensure that we don't run this on a schedule in a fork

CMakeLists.txt

@@ -22,6 +22,9 @@ option(BUILD_SHARED_LIBS "build shared libraries" ON)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+include(CheckLinkerFlag)
+check_linker_flag(CXX "LINKER:--build-id=sha1" LINKER_SUPPORTS_BUILD_ID)
+
 include(GNUInstallDirs)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
@@ -78,6 +81,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WASI")
         $<$<COMPILE_LANGUAGE:C,CXX>:_WASI_EMULATED_MMAN>)
     add_link_options("-Lwasi-emulated-signal")
     add_link_options("-Lwasi-emulated-mman")
+elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+    # On FreeBSD, we should not set U_TIMEZONE
 else()
     add_compile_definitions(
         $<$<COMPILE_LANGUAGE:C,CXX>:U_TIMEZONE=timezone>)

icuSources/CMakeLists.txt

@@ -31,6 +31,10 @@ endif()
 set_target_properties(_FoundationICU PROPERTIES
     INSTALL_RPATH "$ORIGIN")
 
+if(LINKER_SUPPORTS_BUILD_ID)
+  target_link_options(_FoundationICU PRIVATE "LINKER:--build-id=sha1")
+endif()
+
 # Copy Headers to known directory for direct client (XCTest) test builds
 file(COPY
         include/