Skip to content

Conversation

andriydruk
Copy link
Member

@andriydruk andriydruk commented Jun 28, 2025

Note

Upgrade to Swift 6.2 with Swiftly-based bootstrap, refresh build dependencies, adjust Android presets, and remove several custom patches.

  • Build/Toolchain:
    • Upgrade Swift to 6.2 and update build/version to 6.2-r1.
    • Replace release tarball bootstrap with swiftly (install/use 6.2-snapshot; export SWIFT_PATH).
    • Refresh Ubuntu package list in build/000-install-dependencies-nobel.sh and add jq for Swiftly.
  • Android presets:
    • Replace patches/swift/0001-Add-presets-for-android-x86-x86_64.patch with patches/swift/0001-Add-presets-for-android-x86.patch (adds x86 preset; x86_64 handled upstream).
  • Patches cleanup:
    • Remove custom patches:
      • patches/swift-corelibs-foundation/0011-fix-parsing-tzdata-version-2-plus.patch
      • patches/swift-corelibs-foundation/0014-add-swift-syntax-source-dir-variable.patch
      • patches/swift-corelibs-foundation/0015-add-empty-CFPosixSpawnFileActionsChdir-for-android.patch
      • patches/swift-foundation/0001-open-range-attributed-string-from-nsrange.patch
      • patches/swift-syntax/0001-replace-bionic-with-android.patch

Written by Cursor Bugbot for commit 8f0d496. This will update automatically on new commits. Configure here.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Clang Snapshot Path Mismatch

The script hardcodes a specific snapshot date in the toolchain path for accessing clang. This conflicts with swiftly install 6.2-snapshot, which installs the latest available snapshot with a dynamic date. Consequently, the hardcoded directory does not exist, causing the pushd command and clang version check to fail. The toolchain name should be dynamically determined, consistent with SWIFT_PATH export.

build/020-clone-swift.sh#L55-L61

swiftly install 6.2-snapshot
swiftly use 6.2-snapshot
pushd .local/share/swiftly/toolchains/6.2-snapshot-2025-07-04/usr/bin/
./clang --version
popd

Fix in CursorFix in Web


Was this report helpful? Give feedback by reacting with 👍 or 👎

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant