mirror of https://github.com/google/oss-fuzz.git
Fix Botan build in multiple projects (#10050)
This commit is contained in:
parent
6809bfb9bc
commit
cafc75fc8a
|
@ -197,7 +197,7 @@ then
|
|||
./configure.py --cc-bin=$CXX \
|
||||
--cc-abi-flags="$CXXFLAGS" \
|
||||
--disable-shared \
|
||||
--disable-modules=locking_allocator,x509,tls \
|
||||
--disable-modules=locking_allocator,x509 \
|
||||
--build-targets=static \
|
||||
--without-documentation
|
||||
else
|
||||
|
@ -205,7 +205,7 @@ else
|
|||
--cc-bin=$CXX \
|
||||
--cc-abi-flags="$CXXFLAGS" \
|
||||
--disable-shared \
|
||||
--disable-modules=locking_allocator,x509,tls \
|
||||
--disable-modules=locking_allocator,x509 \
|
||||
--build-targets=static \
|
||||
--without-documentation
|
||||
fi
|
||||
|
|
|
@ -37,9 +37,9 @@ export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBECC"
|
|||
cd $SRC/botan
|
||||
if [[ $CFLAGS != *-m32* ]]
|
||||
then
|
||||
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
|
||||
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
|
||||
else
|
||||
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
|
||||
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
|
||||
fi
|
||||
make -j$(nproc)
|
||||
|
||||
|
|
|
@ -80,9 +80,9 @@ fi
|
|||
cd $SRC/botan
|
||||
if [[ $CFLAGS != *-m32* ]]
|
||||
then
|
||||
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
|
||||
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
|
||||
else
|
||||
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
|
||||
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
|
||||
fi
|
||||
make -j$(nproc)
|
||||
|
||||
|
|
|
@ -44,9 +44,9 @@ echo -n '"' >>extra_options.h
|
|||
cd $SRC/botan
|
||||
if [[ $CFLAGS != *-m32* ]]
|
||||
then
|
||||
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
|
||||
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
|
||||
else
|
||||
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
|
||||
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
|
||||
fi
|
||||
make -j$(nproc)
|
||||
export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_BOTAN -DCRYPTOFUZZ_BOTAN_IS_ORACLE"
|
||||
|
|
Loading…
Reference in New Issue