compile-libunwind.sh (honggfuzz-2.4) | : | compile-libunwind.sh (honggfuzz-2.5) | ||
---|---|---|---|---|
skipping to change at line 79 | skipping to change at line 79 | |||
if [ -z "$ANDROID_API" ]; then | if [ -z "$ANDROID_API" ]; then | |||
ANDROID_API="android-26" | ANDROID_API="android-26" | |||
fi | fi | |||
if ! echo "$ANDROID_API" | grep -qoE 'android-[0-9]{1,2}'; then | if ! echo "$ANDROID_API" | grep -qoE 'android-[0-9]{1,2}'; then | |||
echo "[-] Invalid ANDROID_API '$ANDROID_API'" | echo "[-] Invalid ANDROID_API '$ANDROID_API'" | |||
abort 1 | abort 1 | |||
fi | fi | |||
ANDROID_API_V=$(echo "$ANDROID_API" | grep -oE '[0-9]{1,2}$') | ANDROID_API_V=$(echo "$ANDROID_API" | grep -oE '[0-9]{1,2}$') | |||
LC_LDFLAGS="-static" | LC_LDFLAGS="-static -Wl,-z,muldefs" | |||
ARCH="$2" | ARCH="$2" | |||
# Prepare toolchain | # Prepare toolchain | |||
case "$ARCH" in | case "$ARCH" in | |||
arm) | arm) | |||
TOOLCHAIN=arm-linux-androideabi | TOOLCHAIN=arm-linux-androideabi | |||
;; | ;; | |||
arm64) | arm64) | |||
TOOLCHAIN=aarch64-linux-android | TOOLCHAIN=aarch64-linux-android | |||
skipping to change at line 139 | skipping to change at line 139 | |||
abort 1 | abort 1 | |||
fi | fi | |||
if [ ! -f configure ]; then | if [ ! -f configure ]; then | |||
NOCONFIGURE=true ./autogen.sh | NOCONFIGURE=true ./autogen.sh | |||
if [ $? -ne 0 ]; then | if [ $? -ne 0 ]; then | |||
echo "[-] autogen failed" | echo "[-] autogen failed" | |||
abort 1 | abort 1 | |||
fi | fi | |||
# Patch configure | # Patch configure | |||
sed -i -e 's/-lgcc_s/-lgcc/g' configure | sed -i -e 's/-lgcc_s//g' configure | |||
sed -i -e 's/-lgcc//g' configure | ||||
else | else | |||
make clean | make clean | |||
fi | fi | |||
./configure --host=$TOOLCHAIN --disable-coredump | ./configure --host=$TOOLCHAIN --disable-coredump | |||
if [ $? -ne 0 ]; then | if [ $? -ne 0 ]; then | |||
echo "[-] configure failed" | echo "[-] configure failed" | |||
abort 1 | abort 1 | |||
fi | fi | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 3 lines changed or added |