diff options
| author | Dan Liew <daniel.liew@imperial.ac.uk> | 2017-05-23 16:58:51 +0100 |
|---|---|---|
| committer | Dan Liew <delcypher@gmail.com> | 2017-05-23 20:44:16 +0100 |
| commit | 92367dec2ee00cb708454e4c33ff34d80eddb878 (patch) | |
| tree | 323a49983422f5f5398b5c3c662136e9cf3f7a71 | |
| parent | 827786517026ef36f5e69c29fd429c26a934b0f7 (diff) | |
| download | klee-92367dec2ee00cb708454e4c33ff34d80eddb878.tar.gz | |
[TravisCI] Try to unbreak the build against upstream STP.
It seems there are have been quite a few changes upstream that change the way CMake is invoked. There doesn't seem to be any good reason for doing this.
| -rwxr-xr-x | .travis/stp.sh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/.travis/stp.sh b/.travis/stp.sh index 0112ae31..6df59ebe 100755 --- a/.travis/stp.sh +++ b/.travis/stp.sh @@ -33,6 +33,23 @@ if [ "x${STP_VERSION}" != "x" ]; then sudo make install cd ../../ + # Determine STP build flags + if [ "X${STP_VERSION}" = "Xmaster" ]; then + # 7e0b096ee79d59bb5c344b7dd4d51b5b8d226221 s/NO_BOOST/ONLY_SIMPLE/ + # 5e9ca6339a2b3b000aa7a90c18601fdcf1212fe1 Silently BUILD_SHARED_LIBS removed. STATICCOMPILE does something similar + STP_CMAKE_FLAGS=( \ + "-DENABLE_PYTHON_INTERFACE:BOOL=OFF" \ + "-DONLY_SIMPLE:BOOL=ON" \ + "-DSTATICCOMPILE:BOOL=ON" \ + ) + else + STP_CMAKE_FLAGS=( \ + "-DENABLE_PYTHON_INTERFACE:BOOL=OFF" \ + "-DNO_BOOST:BOOL=ON" \ + "-DBUILD_SHARED_LIBS:BOOL=OFF" \ + ) + fi + # Build STP git clone --depth 1 -b "${STP_VERSION}" git://github.com/stp/stp.git src mkdir build @@ -41,7 +58,7 @@ if [ "x${STP_VERSION}" != "x" ]; then # Don't build against boost because that is broken when mixing packaged boost libraries and gcc 4.8 CFLAGS="${SANITIZER_C_FLAGS}" \ CXXFLAGS="${SANITIZER_CXX_FLAGS}" \ - cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DENABLE_PYTHON_INTERFACE:BOOL=OFF -DNO_BOOST:BOOL=ON ../src + cmake "${STP_CMAKE_FLAGS[@]}" ../src set +e # Do not exit if build fails because we need to display the log make >> "${STP_LOG}" 2>&1 |