diff options
| author | Martin Nowack <m.nowack@imperial.ac.uk> | 2020-09-24 21:23:25 +0100 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2020-09-30 16:34:47 +0100 |
| commit | 736c07ed297682e13a9f20330a9d0914b55a419c (patch) | |
| tree | 684c879f12532f53c63201d60588050d58549f30 /scripts | |
| parent | 0d15863538e8de52021258dfaeadf8103be6c290 (diff) | |
| download | klee-736c07ed297682e13a9f20330a9d0914b55a419c.tar.gz | |
Fix docker ID handling for sqlite
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/p-sqlite.inc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/build/p-sqlite.inc b/scripts/build/p-sqlite.inc index 65d3c22c..832af56a 100644 --- a/scripts/build/p-sqlite.inc +++ b/scripts/build/p-sqlite.inc @@ -1,5 +1,6 @@ setup_build_variables_sqlite() { - SQLITE_SRC_PATH="${BASE}/sqlite-amalgamation-3320300" + SQLITE_VERSION="3320300" + SQLITE_SRC_PATH="${BASE}/sqlite-amalgamation-${SQLITE_VERSION}" SQLITE_INSTALL_PATH=${SQLITE_SRC_PATH} SQLITE_SUFFIX="${SANITIZER_SUFFIX}" } @@ -7,14 +8,13 @@ setup_build_variables_sqlite() { download_sqlite() { # Get sqlite release cd "${BASE}" - wget --no-check-certificate "https://www.sqlite.org/2020/sqlite-amalgamation-3320300.zip" - unzip "sqlite-amalgamation-3320300.zip" + wget --no-check-certificate "https://www.sqlite.org/2020/sqlite-amalgamation-${SQLITE_VERSION}.zip" + unzip "sqlite-amalgamation-${SQLITE_VERSION}.zip" } -build_sqlite() { +build_sqlite() { cd "${SQLITE_SRC_PATH}" - # Check if sanitizers should be used to build sqlite if [[ "${SANITIZER_SUFFIX}x" != "x" ]]; then CFLAGS=("${SANITIZER_C_FLAGS[@]}") @@ -42,10 +42,11 @@ setup_artifact_variables_sqlite() { setup_build_variables_sqlite } - get_docker_config_id_sqlite() { + ( setup_build_variables_sqlite - echo "sqlite${SQLITE_SUFFIX}" + echo "${SQLITE_SUFFIX}" + ) } get_build_artifacts_sqlite() { |