File tree Expand file tree Collapse file tree 4 files changed +24
-4
lines changed Expand file tree Collapse file tree 4 files changed +24
-4
lines changed Original file line number Diff line number Diff line change 57
57
cd $SRC /botan
58
58
if [[ $CFLAGS != * -m32* ]]
59
59
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
61
66
else
62
67
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags=" $CXXFLAGS " --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
63
68
fi
Original file line number Diff line number Diff line change @@ -402,7 +402,12 @@ make -B
402
402
cd $SRC /botan
403
403
if [[ $CFLAGS != * -m32* ]]
404
404
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
406
411
else
407
412
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags=" $CXXFLAGS " --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
408
413
fi
Original file line number Diff line number Diff line change @@ -39,7 +39,12 @@ export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBECC"
39
39
cd $SRC /botan
40
40
if [[ $CFLAGS != * -m32* ]]
41
41
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
43
48
else
44
49
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags=" $CXXFLAGS " --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
45
50
fi
Original file line number Diff line number Diff line change 40
40
cd $SRC /botan
41
41
if [[ $CFLAGS != * -m32* ]]
42
42
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
44
49
else
45
50
./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags=" $CXXFLAGS " --disable-shared --disable-modules=locking_allocator --build-targets=static --without-documentation
46
51
fi
You can’t perform that action at this time.
0 commit comments