diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2020-05-23 12:23:33 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-23 12:23:33 +1000 |
| commit | d1b0cc3c71f11a4dc86aa7574819afd6dfcaa9b0 (patch) | |
| tree | 4e0fe55fe121b4c4d36e23a532cb0db706710a8b /netdata-installer.sh | |
| parent | 5b6aa7a5f347758b61e4f3107f0a640d072a6332 (diff) | |
Revert "Fix macOS builds building and linking against openssl (#8865)" (#9137)
This reverts commit 5675f2f48ae4b66526e739c4c5094da1b85ce0e9.
Diffstat (limited to 'netdata-installer.sh')
| -rwxr-xr-x | netdata-installer.sh | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh index 60efae9f3d..eb293ae620 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -479,27 +479,20 @@ trap build_error EXIT # ----------------------------------------------------------------------------- build_libmosquitto() { - CFLAGS= - LDFLAGS= - CXXFLAGS= - if [ "$(uname -s)" = Linux ]; then - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make -C "${1}/lib" + run env CFLAGS= CXXFLAGS= LDFLAGS= make -C "${1}/lib" else pushd ${1} > /dev/null || return 1 if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then - LDFLAGS="-L/usr/local/opt/openssl/lib" - CXXFLAGS="-I/usr/local/opt/openssl/include" - - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake \ + run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \ -D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \ -D WITH_STATIC_LIBRARIES:boolean=YES \ . else - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake -D WITH_STATIC_LIBRARIES:boolean=YES . + run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D WITH_STATIC_LIBRARIES:boolean=YES . fi - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make -C lib + run env CFLAGS= CXXFLAGS= LDFLAGS= make -C lib run mv lib/libmosquitto_static.a lib/libmosquitto.a popd || return 1 fi @@ -560,24 +553,17 @@ bundle_libmosquitto # ----------------------------------------------------------------------------- build_libwebsockets() { - CFLAGS= - LDFLAGS= - CXXFLAGS= - pushd "${1}" > /dev/null || exit 1 if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then - LDFLAGS="-L/usr/local/opt/openssl/lib" - CXXFLAGS="-I/usr/local/opt/openssl/include" - - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake \ + run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \ -D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \ -D LWS_WITH_SOCKS5:bool=ON \ . else - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake -D LWS_WITH_SOCKS5:bool=ON . + run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D LWS_WITH_SOCKS5:bool=ON . fi - run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make + run env CFLAGS= CXXFLAGS= LDFLAGS= make popd > /dev/null || exit 1 } |