Skip to content

Commit

Permalink
Use and support OpenSSL 3 on macOS (dotnet#68045)
Browse files Browse the repository at this point in the history
* Use OpenSSL 3 on macOS

* Update documentation

* Restart CI
  • Loading branch information
vcsjones authored Apr 20, 2022
1 parent 0e839d6 commit 7fd3c92
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/workflow/requirements/macos-requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Install the following packages:

- cmake 3.15.5 or newer
- icu4c
- openssl 1.1
- openssl@1.1 or openssl@3
- pkg-config
- python3
- ninja (optional, enables building native code with ninja instead of make)
Expand Down
2 changes: 1 addition & 1 deletion eng/Brewfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
brew "cmake"
brew "icu4c"
brew "openssl@1.1"
brew "openssl@3"
brew "pkg-config"
brew "python3"
2 changes: 1 addition & 1 deletion eng/native/build-commons.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ check_prereqs()
if ! pkg-config openssl ; then
# 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=$(brew --prefix)/opt/openssl@1.1/lib/pkgconfig:$(brew --prefix)/opt/openssl/lib/pkgconfig
export PKG_CONFIG_PATH=$(brew --prefix)/opt/openssl@3/lib/pkgconfig:$(brew --prefix)/opt/openssl@1.1/lib/pkgconfig:$(brew --prefix)/opt/openssl/lib/pkgconfig
# We try again with the PKG_CONFIG_PATH in place, if pkg-config still can't find OpenSSL, exit with an error, cmake won't find OpenSSL either
pkg-config openssl || { echo >&2 "Please install openssl before running this script, see https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/macos-requirements.md"; exit 1; }
fi
Expand Down

0 comments on commit 7fd3c92

Please sign in to comment.