Skip to content

Commit 173cae9

Browse files
authored
Compile Botan with --disable-asm in MSAN builds (#12300)
1 parent abf555b commit 173cae9

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

projects/bearssl/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@
5757
cd $SRC/botan
5858
if [[ $CFLAGS != *-m32* ]]
5959
then
60-
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
60+
if [[ $CFLAGS != *sanitize=memory* ]]
61+
then
62+
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
63+
else
64+
./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
65+
fi
6166
else
6267
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
6368
fi

projects/cryptofuzz/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,12 @@ make -B
402402
cd $SRC/botan
403403
if [[ $CFLAGS != *-m32* ]]
404404
then
405-
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
405+
if [[ $CFLAGS != *sanitize=memory* ]]
406+
then
407+
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
408+
else
409+
./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
410+
fi
406411
else
407412
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
408413
fi

projects/libecc/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBECC"
3939
cd $SRC/botan
4040
if [[ $CFLAGS != *-m32* ]]
4141
then
42-
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
42+
if [[ $CFLAGS != *sanitize=memory* ]]
43+
then
44+
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
45+
else
46+
./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
47+
fi
4348
else
4449
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
4550
fi

projects/wolfssl/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ then
4040
cd $SRC/botan
4141
if [[ $CFLAGS != *-m32* ]]
4242
then
43-
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
43+
if [[ $CFLAGS != *sanitize=memory* ]]
44+
then
45+
./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
46+
else
47+
./configure.py --disable-asm --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
48+
fi
4449
else
4550
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
4651
fi

0 commit comments

Comments
 (0)