diff options
| author | Cédric Luthi <cedric.luthi@gmail.com> | 2020-05-07 12:12:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 12:12:29 +0300 |
| commit | f6aad636c9bdacb6c98b144449c5d72ef9c50e70 (patch) | |
| tree | eda68f8522b61cabb7cd2fec736f66ed8bbbbd11 /eng/install-native-dependencies.sh | |
| parent | c2b10188d540c863e8233e9a556cbc7af5bfbd8d (diff) | |
Simplify build on macOS (#35570)
* Check for OpenSSL (and pkg-config) in the check_prereqs() function
* Simplify OpenSSL installation instructions
* Automatically pick the OpenSSL version installed by Homebrew by exporting the proper PKG_CONFIG_PATH environment variable
* Improve the error message if cmake can't find OpenSSL
The previous instructions were asking the user to add symbolic links inside /usr/local/lib/ and /usr/local/lib/pkgconfig/ for OpenSSL related files. There is no need for a complicated setup with symbolic links when the PKG_CONFIG_PATH environment variable points to the right pkgconfig, which is now done in build-commons.sh.
Co-Authored-By: Jan Kotas <jkotas@microsoft.com>
Co-Authored-By: Jeremy Barton <jbarton@microsoft.com>
Diffstat (limited to 'eng/install-native-dependencies.sh')
| -rw-r--r-- | eng/install-native-dependencies.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eng/install-native-dependencies.sh b/eng/install-native-dependencies.sh index 9670ae59031..be154811ea7 100644 --- a/eng/install-native-dependencies.sh +++ b/eng/install-native-dependencies.sh @@ -15,11 +15,10 @@ elif [ "$1" = "OSX" ]; then if [ "$?" != "0" ]; then exit 1; fi - brew install icu4c openssl autoconf automake libtool pkg-config python3 + brew install autoconf automake icu4c libtool openssl@1.1 pkg-config python3 if [ "$?" != "0" ]; then exit 1; fi - brew link --force icu4c if [ "$?" != "0" ]; then exit 1; fi @@ -29,7 +28,7 @@ elif [ "$1" = "tvOS" ]; then if [ "$?" != "0" ]; then exit 1; fi - brew install openssl autoconf automake libtool pkg-config python3 + brew install autoconf automake libtool openssl@1.1 pkg-config python3 if [ "$?" != "0" ]; then exit 1; fi @@ -39,7 +38,7 @@ elif [ "$1" = "iOS" ]; then if [ "$?" != "0" ]; then exit 1; fi - brew install openssl autoconf automake libtool pkg-config python3 + brew install autoconf automake libtool openssl@1.1 pkg-config python3 if [ "$?" != "0" ]; then exit 1; fi |