Work

Signed-off-by: Cole Miller <cole.miller@canonical.com>

configure.ac

@@ -6,8 +6,7 @@ AC_CONFIG_AUX_DIR([ac])
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror -Wno-portability foreign])
 AM_SILENT_RULES([yes])
 
-# Without this line, AC_PROG_CC boneheadedly adds `-g -O2` to our CFLAGS.
-AC_SUBST(CFLAGS, "")
+AC_SUBST(AM_CFLAGS)
 AC_PROG_CC
 AC_USE_SYSTEM_EXTENSIONS
 

contrib/build-static.sh

@@ -52,6 +52,7 @@ if [ ! -f "${INSTALL_DIR}/musl/bin/musl-gcc" ]; then
 fi
 
 export PATH="${PATH}:${INSTALL_DIR}/musl/bin"
+export CFLAGS="${CFLAGS} -isystem ${INSTALL_DIR}/musl/include"
 export CC=musl-gcc
 
 # build libtirpc
@@ -116,7 +117,7 @@ if [ ! -f "${BUILD_DIR}/sqlite/libsqlite3.la" ]; then
     cd sqlite
     ./configure --disable-shared --disable-readline --prefix="${INSTALL_DIR}" \
       CFLAGS="${CFLAGS} -DSQLITE_ENABLE_DBSTAT_VTAB=1"
-    make install -j BCC="${CC} -g -O2 ${CFLAGS} ${LDFLAGS}"
+    make install -j BCC="${CC} -g -O2 ${CFLAGS}"
   )
 fi
 
@@ -128,8 +129,7 @@ if [ ! -f "${BUILD_DIR}/dqlite/libdqlite.la" ]; then
     git clone "${REPO_DQLITE}" --depth 1 --branch "${TAG_DQLITE}"
     cd dqlite
     autoreconf -i
-    ./configure --disable-shared --enable-build-raft --prefix="${INSTALL_DIR}" \
-      CFLAGS="${CFLAGS} -I${INSTALL_DIR}/musl/include"
+    ./configure --disable-shared --enable-build-raft --prefix="${INSTALL_DIR}"
 
     make unit-test LDFLAGS=-all-static
     pwd