From df03cb2af908c4efcab4f6f343da4ebc98e3d3c9 Mon Sep 17 00:00:00 2001 From: Martin Nowack Date: Thu, 4 Apr 2019 22:08:58 +0100 Subject: Remove CC as requirement; automatically set by sanitizer_compiler Update build sqlite script --- scripts/build/p-sqlite.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'scripts/build/p-sqlite.inc') diff --git a/scripts/build/p-sqlite.inc b/scripts/build/p-sqlite.inc index 8f94cc87..16c1b220 100644 --- a/scripts/build/p-sqlite.inc +++ b/scripts/build/p-sqlite.inc @@ -14,16 +14,17 @@ download_sqlite() { build_sqlite() { cd "${SQLITE_SRC_PATH}" - local CFLAGS="" - local COMP=${CC} - # Check if sanitizers should be used to build stp + # Check if sanitizers should be used to build sqlite if [[ "${SANITIZER_SUFFIX}x" != "x" ]]; then CFLAGS="${SANITIZER_C_FLAGS[*]}" - COMP=${SANITIZER_C_COMPILER} + COMP="${SANITIZER_C_COMPILER}" + else + COMP="${BITCODE_CC}" + [[ -z "${COMP}" ]] && COMP="$(which gcc)" fi - ${COMP} ${CFLAGS} -fPIC -o libsqlite3.so -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -shared sqlite3.c + ${COMP} ${CFLAGS} -fPIC -o libsqlite3.so -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -shared sqlite3.c } install_sqlite() { -- cgit 1.4.1