Skip to content

Conversation

xtremekforever
Copy link
Collaborator

@xtremekforever xtremekforever commented Jun 22, 2025

  • Removed all of the llvm-cmake-modules from swift-stdlib. Instead we checkout swiftlang/llvm-project on the given Swift tag, configure it, and point LLVM_DIR to where the LLVM cmake files are generated in the build directory.
  • Removed the unused buildbot cross-compile patch. This is not useful/does not affect anything when compiling Swift using cmake.
  • Fixed typos in the 2 do_fix_gcc_install_dir() methods:
    1. TARGET_ARCH should be used instead of SWIFT_TARGET_ARCH, since we are attempting to fix a symlink in the sysroot, which uses the TARGET_ARCH name.
    2. There was -oe-linux instead of ${TARGET_VENDOR}-${TARGET_OS} in one of the fix methods. I assume that was just a typo/missed.

@lhoward would you do me a favor and see if these changes compile for you? I was able to compile everything except swift-testing/swift-xctest due to an error with the SSH_AUTH_SOCK stuff. Not sure if I'm simply missing some sort of env variable or something, but I also think that the recipe should work even if that is not set. Anyway, here are the logs I'm getting:

Also, @xavgru12 @jeremy-prater so you can see the activity

 - Not needed when building with cmake, it can be added again if building with build-script
 - We point LLVM_DIR to the build directory for those llvm cmake files.
 - SWIFT_TARGET_ARCH cannot be used since the arch in the sysroot may likely be different.
 - Looks like pointing to `-oe-linux` was another typo as well in swift.bbclass.
@lhoward lhoward merged commit e3af933 into PADL:release/6.1_separate_commits Jun 22, 2025
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.

2 participants