From 1ea0d8d0897ec2d84ff447874e2ebd6170f54287 Mon Sep 17 00:00:00 2001
From: Andrew Moss <1043609+amoss@users.noreply.github.com>
Date: Thu, 27 Feb 2020 19:23:18 +0100
Subject: Adding support for ACLK build-configuration (#8223)

* Fixes for issues not caught at review in #8144. (#8211)

* Properly scrub build environment for external dependencies.

* Remove LWS from our system-level dependencies.

We've decided to just always bundle it in the installer.

* Add missing dependency for Docker build process.

* Use static-build of LWS library created by installer (#8157)

* link static lib of LWS

* only use static LWS by installer

* handle -lcap

* fix problem on debian without lcap

* fix lws check

Co-authored-by: Austin S. Hemmelgarn <ahferroin7@gmail.com>
Co-authored-by: Timo <6674623+underhood@users.noreply.github.com>
---
 netdata-installer.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'netdata-installer.sh')

diff --git a/netdata-installer.sh b/netdata-installer.sh
index 8887a8899c..92873f9482 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -436,7 +436,7 @@ trap build_error EXIT
 # -----------------------------------------------------------------------------
 
 build_libmosquitto() {
-  run make -C "${1}/lib"
+  run env CFLAGS= CXXFLAGS= LDFLAGS= make -C "${1}/lib"
 }
 
 copy_libmosquitto() {
@@ -492,8 +492,8 @@ bundle_libmosquitto
 
 build_libwebsockets() {
   pushd "${1}" > /dev/null || exit 1
-  cmake -D LWS_WITH_SOCKS5:bool=ON .
-  make
+  run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D LWS_WITH_SOCKS5:bool=ON .
+  run env CFLAGS= CXXFLAGS= LDFLAGS= make
   popd > /dev/null || exit 1
 }
 
-- 
cgit v1.2.3