build-commons.sh: check for OpenSSL 1.1 on macOS#43037
Merged
ViktorHofer merged 1 commit intodotnet:masterfrom Oct 5, 2020
Merged
build-commons.sh: check for OpenSSL 1.1 on macOS#43037ViktorHofer merged 1 commit intodotnet:masterfrom
ViktorHofer merged 1 commit intodotnet:masterfrom
Conversation
We're installing openssl@1.1 from Homebrew so we should check that version. It looks like CI Macs don't set the /usr/local/opt/openssl symlink anymore.
|
Tagging subscribers to this area: @ViktorHofer |
am11
reviewed
Oct 5, 2020
| # We export the proper PKG_CONFIG_PATH where openssl was installed by Homebrew | ||
| # It's important to _export_ it since build-commons.sh is sourced by other scripts such as build-native.sh | ||
| export PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig | ||
| export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig |
Member
There was a problem hiding this comment.
Maybe include both directories?
Suggested change
| export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig | |
| export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig | |
| export PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/openssl@1.1/lib/pkgconfig |
Member
There was a problem hiding this comment.
@akoeplinger if this suggestion makes sense, do you mind following-up on it in another PR?
Member
Author
There was a problem hiding this comment.
yeah I think that makes sense
Member
|
Let's merge this in to unblock CI. |
ViktorHofer
approved these changes
Oct 5, 2020
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Oct 5, 2020
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Oct 5, 2020
…t#43037) We're installing openssl@1.1 from Homebrew so we should check that version. It looks like CI Macs don't set the /usr/local/opt/openssl symlink anymore. Backport of dotnet#43037 to release/5.0
akoeplinger
added a commit
that referenced
this pull request
Oct 5, 2020
ViktorHofer
pushed a commit
that referenced
this pull request
Oct 6, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We're installing openssl@1.1 from Homebrew so we should check that version.
It looks like CI Macs don't set the /usr/local/opt/openssl symlink anymore: