Skip to content

Conversation

@neonichu
Copy link
Contributor

In PIF generation, we were unconditionally generating a module map, but this needs to be conditional on whether clangTarget.moduleMapPath exists.

In PIF generation, we were unconditionally generating a module map, but
this needs to be conditional on whether `clangTarget.moduleMapPath`
exists.
@neonichu
Copy link
Contributor Author

@swift-ci please smoke test

Copy link
Contributor

@jakepetroules jakepetroules left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@shahmishal
Copy link
Member

Merging to unblock Apple Silicon toolchain.

@shahmishal shahmishal merged commit 10fd75f into swiftlang:master Sep 1, 2020
@neonichu neonichu deleted the pif-module-map-fix branch September 23, 2020 21:01
neonichu added a commit to neonichu/swift-package-manager that referenced this pull request Dec 21, 2020
We merged that PR without a unit test, this adds one.

rdar://68158441
neonichu added a commit that referenced this pull request Dec 22, 2020
We merged that PR without a unit test, this adds one.

rdar://68158441
federicobucchi pushed a commit to federicobucchi/swift-package-manager that referenced this pull request Jan 6, 2021
We merged that PR without a unit test, this adds one.

rdar://68158441
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.

4 participants