diff options
| author |  Guido Vranken <guidovranken@users.noreply.github.com> | 2020-04-21 04:46:33 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-04-20 19:46:33 -0700 |
| commit | 8bc431e264b863f88f30a1800d1a980b127bfcc0 (patch) | |
| tree | 48b152ed2412cbe02dc32814040f9b83dbf0f1ad /projects/cryptofuzz | |
| parent | ed292c0b4036c4dd84d230be64d8504623070c47 (diff) | |
[cryptofuzz] Don't build libgcrypt with MemorySanitizer (#3679)
Diffstat (limited to 'projects/cryptofuzz')
| -rwxr-xr-x | projects/cryptofuzz/build.sh | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh index 71dc2fbd..9a53c981 100755 --- a/projects/cryptofuzz/build.sh +++ b/projects/cryptofuzz/build.sh @@ -151,41 +151,41 @@ cd $SRC/cryptofuzz/modules/botan make -B ############################################################################## -# Compile libgpg-error (dependency of libgcrypt) -cd $SRC/ -tar jxvf libgpg-error-1.36.tar.bz2 -cd libgpg-error-1.36/ -if [[ $CFLAGS != *-m32* ]] +if [[ $CFLAGS != *sanitize=memory* ]] then - ./configure --enable-static -else - ./configure --enable-static --host=i386 -fi -make -j$(nproc) >/dev/null 2>&1 -make install -export LINK_FLAGS="$LINK_FLAGS $SRC/libgpg-error-1.36/src/.libs/libgpg-error.a" + # Compile libgpg-error (dependency of libgcrypt) + cd $SRC/ + tar jxvf libgpg-error-1.36.tar.bz2 + cd libgpg-error-1.36/ + if [[ $CFLAGS != *-m32* ]] + then + ./configure --enable-static + else + ./configure --enable-static --host=i386 + fi + make -j$(nproc) >/dev/null 2>&1 + make install + export LINK_FLAGS="$LINK_FLAGS $SRC/libgpg-error-1.36/src/.libs/libgpg-error.a" -# Compile libgcrypt -cd $SRC/libgcrypt -autoreconf -ivf -if [[ $CFLAGS = *-m32* ]] -then - ./configure --enable-static --disable-doc --host=i386 -elif [[ $CFLAGS = *sanitize=memory* ]] -then - ./configure --enable-static --disable-doc --disable-asm -else - ./configure --enable-static --disable-doc -fi -make -j$(nproc) >/dev/null 2>&1 + # Compile libgcrypt + cd $SRC/libgcrypt + autoreconf -ivf + if [[ $CFLAGS = *-m32* ]] + then + ./configure --enable-static --disable-doc --host=i386 + else + ./configure --enable-static --disable-doc + fi + make -j$(nproc) >/dev/null 2>&1 -export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBGCRYPT" -export LIBGCRYPT_A_PATH="$SRC/libgcrypt/src/.libs/libgcrypt.a" -export LIBGCRYPT_INCLUDE_PATH="$SRC/libgcrypt/src" + export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBGCRYPT" + export LIBGCRYPT_A_PATH="$SRC/libgcrypt/src/.libs/libgcrypt.a" + export LIBGCRYPT_INCLUDE_PATH="$SRC/libgcrypt/src" -# Compile Cryptofuzz libgcrypt module -cd $SRC/cryptofuzz/modules/libgcrypt -make -B + # Compile Cryptofuzz libgcrypt module + cd $SRC/cryptofuzz/modules/libgcrypt + make -B +fi # Compile libsodium cd $SRC/libsodium |