diff options
| author | Bhargava Shastry <bshas3@gmail.com> | 2019-09-17 23:15:03 +0200 |
|---|---|---|
| committer | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2019-09-17 14:15:03 -0700 |
| commit | 7aa1d7b9a3218a3646d191902fbfdc7e3e8caca1 (patch) | |
| tree | df61f6968c3bf919b4abce70d6d725373b9891f5 /projects/solidity | |
| parent | 44e7362ff5b109c0f12b9b7470cd239f8504b98e (diff) | |
| download | oss-fuzz-7aa1d7b9a3218a3646d191902fbfdc7e3e8caca1.tar.gz | |
solidity: Use cmake toolchain file (#2841)
Diffstat (limited to 'projects/solidity')
| -rw-r--r-- | projects/solidity/Dockerfile | 4 | ||||
| -rwxr-xr-x | projects/solidity/build.sh | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/projects/solidity/Dockerfile b/projects/solidity/Dockerfile index 67fc45869..92521c3bd 100644 --- a/projects/solidity/Dockerfile +++ b/projects/solidity/Dockerfile @@ -86,8 +86,8 @@ RUN cd $SRC/ethash; \ RUN cd $SRC/z3; \ mkdir -p build; \ cd build; \ - LDFLAGS="${CXXFLAGS} -static" cmake .. -DBUILD_LIBZ3_SHARED=OFF; \ + LDFLAGS=$CXXFLAGS cmake -DBUILD_LIBZ3_SHARED=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..; \ make libz3 -j; \ - cp libz3.a /usr/lib; + make install; COPY build.sh $SRC/ diff --git a/projects/solidity/build.sh b/projects/solidity/build.sh index 35e67c074..e83e56c4f 100755 --- a/projects/solidity/build.sh +++ b/projects/solidity/build.sh @@ -31,12 +31,7 @@ cd build rm -rf * # Build solidity -cmake -DUSE_CVC4=OFF -DOSSFUZZ=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DBoost_FOUND=1 \ - -DBoost_USE_STATIC_LIBS=1 \ - -DBoost_USE_STATIC_RUNTIME=1 \ - $SRC/solidity +cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/ossfuzz.cmake $SRC/solidity make ossfuzz ossfuzz_proto ossfuzz_abiv2 -j $(nproc) # Copy fuzzer binary, seed corpus, fuzzer options, and dictionary |