diff --git a/configure.sh b/configure.sh
index 96c058f..a6465bc 100755
--- a/configure.sh
+++ b/configure.sh
@@ -123,13 +123,16 @@ cd build
 # * https://github.com/termux/termux-packages/issues/6176
 # * https://github.com/termux/termux-packages/issues/2469
 
-if command -v termux-setup-storage >/dev/null 2>&1; then
-	extra_args="CFLAGS=-D__ANDROID_API__=$(getprop ro.build.version.sdk) CXXFLAGS=-D__ANDROID_API__=$(getprop ro.build.version.sdk)"
-else
-	extra_args=
-fi
-
-
 echo "$TAG Configuring binutils..."
-run_quietly giteapc-configure.log \
-../binutils-$VERSION/configure --prefix="$PREFIX" --target=sh3eb-elf --with-multilib-list=m3,m4-nofpu --program-prefix=sh-elf- --enable-libssp --enable-lto $extra_args
+
+if command -v termux-setup-storage >/dev/null 2>&1; then
+
+  run_quietly giteapc-configure.log \
+  ../binutils-$VERSION/configure --prefix="$PREFIX" --target=sh3eb-elf --with-multilib-list=m3,m4-nofpu --program-prefix=sh-elf- --enable-libssp --enable-lto CFLAGS="-D__ANDROID_API__=$(getprop ro.build.version.sdk) -g -O2" CXXFLAGS="-D__ANDROID_API__=$(getprop ro.build.version.sdk) -g -O2"
+
+else
+
+  run_quietly giteapc-configure.log \
+  ../binutils-$VERSION/configure --prefix="$PREFIX" --target=sh3eb-elf --with-multilib-list=m3,m4-nofpu --program-prefix=sh-elf- --enable-libssp --enable-lto
+
+fi