Revert "Fix macOS builds building and linking against openssl (#8865)" (#9137)
This reverts commit 5675f2f48ae4b66526e739c4c5094da1b85ce0e9.
James Mills committed
May 23, 2020 at 12:23 UTC
d1b0cc3c71f11a4dc86aa7574819afd6dfcaa9b0
1 file changed
+7
-21
netdata-installer.sh
+7
-21
@@ -479,27 +479,20 @@ trap build_error EXIT
479
# -----------------------------------------------------------------------------
480
481
build_libmosquitto() {
482
- CFLAGS=
483
- LDFLAGS=
484
- CXXFLAGS=
485
-
482
if [ "$(uname -s)" = Linux ]; then
487
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make -C "${1}/lib"
483
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make -C "${1}/lib"
484
else
485
pushd ${1} > /dev/null || return 1
486
if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then
491
- LDFLAGS="-L/usr/local/opt/openssl/lib"
492
- CXXFLAGS="-I/usr/local/opt/openssl/include"
493
-
494
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake \
487
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \
488
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
489
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
490
-D WITH_STATIC_LIBRARIES:boolean=YES \
491
.
492
else
500
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake -D WITH_STATIC_LIBRARIES:boolean=YES .
493
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D WITH_STATIC_LIBRARIES:boolean=YES .
494
fi
502
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make -C lib
495
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make -C lib
496
run mv lib/libmosquitto_static.a lib/libmosquitto.a
497
popd || return 1
498
fi
@@ -560,24 +553,17 @@ bundle_libmosquitto
553
# -----------------------------------------------------------------------------
554
555
build_libwebsockets() {
563
- CFLAGS=
564
- LDFLAGS=
565
- CXXFLAGS=
566
-
556
pushd "${1}" > /dev/null || exit 1
557
if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then
569
- LDFLAGS="-L/usr/local/opt/openssl/lib"
570
- CXXFLAGS="-I/usr/local/opt/openssl/include"
571
-
572
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake \
558
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \
559
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
560
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
561
-D LWS_WITH_SOCKS5:bool=ON \
562
.
563
else
578
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake -D LWS_WITH_SOCKS5:bool=ON .
564
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D LWS_WITH_SOCKS5:bool=ON .
565
fi
580
- run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make
566
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make
567
popd > /dev/null || exit 1
568
}
569