Skip to content

build: only attempt to install MSVC system libraries on Windows #6

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
Sep 7, 2018

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Sep 5, 2018

Newer versions of CMake attempt to query the system for information about the VS
2017 installation. Unfortunately, this query fails on non-Windows systems when
cross-compiling:

cmake_host_system_information does not recognize <key> VS_15_DIR

CMake will not find these system libraries on non-Windows hosts anyways, and we
were silencing the warnings, so simply omit the installation when
cross-compiling to Windows.

Newer versions of CMake attempt to query the system for information about the VS
2017 installation.  Unfortunately, this query fails on non-Windows systems when
cross-compiling:

	cmake_host_system_information does not recognize <key> VS_15_DIR

CMake will not find these system libraries on non-Windows hosts anyways, and we
were silencing the warnings, so simply omit the installation when
cross-compiling to Windows.
@compnerd
Copy link
Member Author

compnerd commented Sep 5, 2018

@swift-ci please test

@jrose-apple
Copy link

Is this something we can fix in upstream CMark instead?

@compnerd
Copy link
Member Author

compnerd commented Sep 5, 2018

@jrose-apple, hmm, I can certainly create a pull request there as well, but this definitely is something that I think we should have in the mean time. But, thanks for the reminder that there is an upstream to this!

@compnerd
Copy link
Member Author

compnerd commented Sep 5, 2018

Created commonmark#265 to get this merged upstream. It definitely has diverged, so cherry-picking wont work cleanly BTW.

@jrose-apple
Copy link

Hm. I don't remember what our process is for updating to the latest CMark. @najacque, @tkremenek?

@compnerd
Copy link
Member Author

compnerd commented Sep 6, 2018

@jrose-apple - thoughts on merging this until we get this tree updated from upstream? (commonmark#265 is merged!)

@jrose-apple
Copy link

I think it's okay. I feel like it's the same thing as cherry-picking an upstream LLVM change.

@compnerd
Copy link
Member Author

compnerd commented Sep 7, 2018

@jrose-apple - seems that I don't have merge access on this repository. Would you mind helping?

@jrose-apple jrose-apple merged commit b00c889 into swiftlang:master Sep 7, 2018
@jrose-apple
Copy link

Done!

@compnerd compnerd deleted the windows-cross-compile branch September 7, 2018 00:16
@tkremenek
Copy link
Member

We do not have a regular process for updating this repository against upstream, but now would be a good time.

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