diff --git a/build.sh b/build.sh
index a15a032920..18d20840ff 100755
--- a/build.sh
+++ b/build.sh
@@ -95,7 +95,7 @@ package_linux() {
 
 postbuild=''
 debug_opts=''
-build_cflags='-O3'
+build_cflags=''
 default_job_count='12'
 sys_ldflags=''
 
@@ -164,7 +164,7 @@ done
 
 target="qemu-system-i386"
 if test ! -z "$debug"; then
-    build_cflags='-O0 -g -DXEMU_DEBUG_BUILD=1'
+    build_cflags='-DXEMU_DEBUG_BUILD=1'
     opts="--enable-debug --enable-trace-backends=log"
 else
     opts="--enable-lto"
diff --git a/configure b/configure
index c0868b23db..8c843fef72 100755
--- a/configure
+++ b/configure
@@ -5290,7 +5290,7 @@ if test "$skip_meson" = no; then
         -Ddocdir="$docdir" \
         -Dqemu_firmwarepath="$firmwarepath" \
         -Dqemu_suffix="$qemu_suffix" \
-        -Doptimization=$(if test "$debug" = yes; then echo 0; else echo 2; fi) \
+        -Doptimization=$(if test "$debug" = yes; then echo g; else echo 3; fi) \
         -Ddebug=$(if test "$debug_info" = yes; then echo true; else echo false; fi) \
         -Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \
         -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \