diff options
| author | Jack Lloyd <[email protected]> | 2016-08-31 12:58:58 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-31 12:58:58 -0400 |
| commit | dfab07a7bc00dc00f98ab86c70d536306073f34f (patch) | |
| tree | d3dbb140764f259c932171d6f229d033dee685ca /src/scripts/ci/circle/gcc-static-debug.sh | |
| parent | e29024608fca1b811aa72a7aafd930a42740b968 (diff) | |
| parent | 1b9cf39063194fe91dc8e5d78f73d7251c5d16fc (diff) | |
Merge master into this branch, resolving conflicts with #457/#576
which recently landed on master.
Diffstat (limited to 'src/scripts/ci/circle/gcc-static-debug.sh')
| -rwxr-xr-x | src/scripts/ci/circle/gcc-static-debug.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripts/ci/circle/gcc-static-debug.sh b/src/scripts/ci/circle/gcc-static-debug.sh index 76f4c46b7..3a8900fb4 100755 --- a/src/scripts/ci/circle/gcc-static-debug.sh +++ b/src/scripts/ci/circle/gcc-static-debug.sh @@ -5,6 +5,6 @@ which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if avai BUILD_NICKNAME=$(basename "$0" .sh) BUILD_DIR="./build-$BUILD_NICKNAME" -./configure.py --with-build-dir="$BUILD_DIR" --with-debug-info --disable-shared --via-amalgamation +./configure.py --with-build-dir="$BUILD_DIR" --with-debug-info --disable-shared --via-amalgamation --with-pkcs11 make -j 2 -f "$BUILD_DIR"/Makefile "$BUILD_DIR"/botan-test |