Skip to content
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.

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

Fix modules path for XCBuild #7180

Merged
merged 1 commit into from
Dec 12, 2023
Merged

Fix modules path for XCBuild #7180

merged 1 commit into from
Dec 12, 2023

Conversation

neonichu
Copy link
Contributor

When using XCBuild, we don't segment Swift modules into a "Modules" subdirectory, so we have to special case this during installation.

This should fix the same issue as the revert in #7173

@neonichu neonichu self-assigned this Dec 11, 2023
@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu
Copy link
Contributor Author

@swift-ci please test package compatibility

@neonichu
Copy link
Contributor Author

Traceback (most recent call last):
  File "/home/build-user/swiftpm/Utilities/bootstrap", line 828, in <module>
    main()
  File "/home/build-user/swiftpm/Utilities/bootstrap", line 65, in main
    args.func(args)
  File "/home/build-user/swiftpm/Utilities/bootstrap", line 397, in install
    install_swiftpm(prefix, args)
  File "/home/build-user/swiftpm/Utilities/bootstrap", line 437, in install_swiftpm
    install_dylib(args, "PackageDescription", dest, ["PackageDescription", "CompilerPluginSupport"])
  File "/home/build-user/swiftpm/Utilities/bootstrap", line 452, in install_dylib
    if re.match("macosx-", args.cross_compile_hosts):
  File "/usr/lib/python3.8/re.py", line 191, in match
    return _compile(pattern, flags).match(string)
TypeError: expected string or bytes-like object

When using XCBuild, we don't segment Swift modules into a "Modules" subdirectory, so we have to special case this during installation.
@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu
Copy link
Contributor Author

@swift-ci please test package compatibility

@neonichu
Copy link
Contributor Author

@swift-ci please test windows

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.

3 participants