diff options
| author | Martin Nowack <m.nowack@imperial.ac.uk> | 2019-04-04 22:08:58 +0100 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2019-04-05 15:43:46 +0100 |
| commit | df03cb2af908c4efcab4f6f343da4ebc98e3d3c9 (patch) | |
| tree | ed747fc25ec3e7bf0918ccd4df14ce0301cdaea9 | |
| parent | 8bee70d3ce327f27fc0cf8f7c092a7317d88173a (diff) | |
| download | klee-df03cb2af908c4efcab4f6f343da4ebc98e3d3c9.tar.gz | |
Remove CC as requirement; automatically set by sanitizer_compiler
Update build sqlite script
| -rw-r--r-- | scripts/build/p-sqlite.inc | 11 | ||||
| -rw-r--r-- | scripts/build/v-sanitizer_compiler.inc | 3 | ||||
| -rw-r--r-- | scripts/build/v-sqlite.inc | 4 |
3 files changed, 8 insertions, 10 deletions
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() { diff --git a/scripts/build/v-sanitizer_compiler.inc b/scripts/build/v-sanitizer_compiler.inc index e0cf2468..27c1f073 100644 --- a/scripts/build/v-sanitizer_compiler.inc +++ b/scripts/build/v-sanitizer_compiler.inc @@ -15,7 +15,6 @@ artifact_dependency_sanitizer_compiler(){ setup_variables_sanitizer_compiler() { for sanitizer in "${SANITIZERS[@]}"; do [[ -z "${sanitizer}" ]] && continue - SANITIZER_CMAKE_C_COMPILER=[""] + SANITIZER_CMAKE_C_COMPILER=("") done - } \ No newline at end of file diff --git a/scripts/build/v-sqlite.inc b/scripts/build/v-sqlite.inc index 1a4f7db5..594912a6 100644 --- a/scripts/build/v-sqlite.inc +++ b/scripts/build/v-sqlite.inc @@ -1,5 +1,3 @@ artifact_dependency_sqlite=("sanitizer_compiler") -required_variables_sqlite=( - "CC" -) +required_variables_sqlite=("") |