Fix macOS builds building and linking against openssl (#8865)
* Fix macOS builds building and linking against openssl * Add suggestions from @knatsakis
James Mills committed
May 21, 2020 at 11:27 UTC
5675f2f48ae4b66526e739c4c5094da1b85ce0e9
1 file changed
+21
-7
netdata-installer.sh
+21
-7
@@ -479,20 +479,27 @@ trap build_error EXIT
479
# -----------------------------------------------------------------------------
480
481
build_libmosquitto() {
482
+ CFLAGS=
483
+ LDFLAGS=
484
+ CXXFLAGS=
485
+
486
if [ "$(uname -s)" = Linux ]; then
483
- run env CFLAGS= CXXFLAGS= LDFLAGS= make -C "${1}/lib"
487
+ run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make -C "${1}/lib"
488
else
489
pushd ${1} > /dev/null || return 1
490
if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then
487
- run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \
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 \
495
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
496
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
497
-D WITH_STATIC_LIBRARIES:boolean=YES \
498
.
499
else
493
- run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D WITH_STATIC_LIBRARIES:boolean=YES .
500
+ run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake -D WITH_STATIC_LIBRARIES:boolean=YES .
501
fi
495
- run env CFLAGS= CXXFLAGS= LDFLAGS= make -C lib
502
+ run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make -C lib
503
run mv lib/libmosquitto_static.a lib/libmosquitto.a
504
popd || return 1
505
fi
@@ -553,17 +560,24 @@ bundle_libmosquitto
560
# -----------------------------------------------------------------------------
561
562
build_libwebsockets() {
563
+ CFLAGS=
564
+ LDFLAGS=
565
+ CXXFLAGS=
566
+
567
pushd "${1}" > /dev/null || exit 1
568
if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then
558
- run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \
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 \
573
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
574
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
575
-D LWS_WITH_SOCKS5:bool=ON \
576
.
577
else
564
- run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D LWS_WITH_SOCKS5:bool=ON .
578
+ run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" cmake -D LWS_WITH_SOCKS5:bool=ON .
579
fi
566
- run env CFLAGS= CXXFLAGS= LDFLAGS= make
580
+ run env CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" make
581
popd > /dev/null || exit 1
582
}
583