Skip to content

build: switch the module map according to the target #261

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

Merged
merged 1 commit into from
Jun 28, 2017

Conversation

compnerd
Copy link
Member

Use a darwin specific modulemap on darwin, and the generic one
elsewhere.

@compnerd
Copy link
Member Author

CC: @das

Should help with the Darwin support.

@das
Copy link
Contributor

das commented Jun 28, 2017

makes sense, don't we have this distinction on the install path somewhere already ? (the right modulemap has to be installed as well on a per-platform basis)
they could probably shared the same variable

Use a darwin specific modulemap on darwin, and the generic one
elsewhere.  This fixes the cmake build to create the symlinks like the
autotools build and cause the installation to be correct on Darwin as
well as the build.
@compnerd
Copy link
Member Author

Seems that the build use to rely on symbolic links. Add support for doing that in the CMake build rather than the custom handling.

@das
Copy link
Contributor

das commented Jun 28, 2017

ok, makes sense to replicate that if that is how the existing autoconf build system was doing it, and I guess that also makes the install of the modulemap work (by copying the target of the symlink)

@das das merged commit c2d0c49 into swiftlang:master Jun 28, 2017
@compnerd compnerd deleted the module-maps branch June 28, 2017 05:34
das added a commit that referenced this pull request Jul 31, 2017
build: switch the module map according to the target

Signed-off-by: Daniel A. Steffen <[email protected]>
@das das removed the darwin pending label Aug 1, 2017
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