diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index b844a3591c8a4..074b2da9f6a6c 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -196,7 +196,13 @@ mozconfig_init() {
 	fi
 
 	# Strip optimization so it does not end up in compile string
-	filter-flags '-O* -ggdb3'
+	filter-flags '-O*'
+
+	filter-flags '-O*'
+
+	if is-flagq '-g*' ; then
+		mozconfig_annotate 'elf-hack broken with -g* flags' --disable-elf-hack
+	fi
 
 	# Strip over-aggressive CFLAGS
 	use custom-cflags || strip-flags