:: commit 2813d4a6a2af50510eb6ff53e5aeb1babf576bf1

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f83721bc..22cfd0ef 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -41,41 +41,26 @@ override BUILD_UEFI_CD := @BUILD_UEFI_CD@
 override BUILD_BIOS_PXE := @BUILD_BIOS_PXE@
 override BUILD_BIOS_CD := @BUILD_BIOS_CD@
 
-CC := @CC@
-export CC
-
-MKDIR_P := @MKDIR_P@
-export MKDIR_P
-
 INSTALL := @INSTALL@
-export INSTALL
-
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
-export INSTALL_PROGRAM
-
 INSTALL_DATA := @INSTALL_DATA@
-export INSTALL_DATA
-
 STRIP := @STRIP@
-export STRIP
 
+MKDIR_P := @MKDIR_P@
+export MKDIR_P
 GREP := @GREP@
 export GREP
-
 SED := @SED@
 export SED
-
 AWK := @AWK@
 export AWK
 
+CC := @CC@
+
 CPPFLAGS := @CPPFLAGS@
-export CPPFLAGS
 CFLAGS := @CFLAGS@
-export CFLAGS
 LDFLAGS := @LDFLAGS@
-export LDFLAGS
 LIBS := @LIBS@
-export LIBS
 
 override WERROR_FLAG := @WERROR_FLAG@
 export WERROR_FLAG
diff --git a/common/common.mk b/common/common.mk
index 4377af26..27132395 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -36,6 +36,9 @@ override CFLAGS_FOR_TARGET += \
     -fno-strict-aliasing \
     -fno-lto
 
+override CFLAGS_FOR_TARGET := \
+    $(patsubst -g,-gdwarf,$(CFLAGS_FOR_TARGET))
+
 override CPPFLAGS_FOR_TARGET := \
     -I . \
     -I libc-compat \
@@ -59,11 +62,14 @@ $(call MKESCAPE,$(BUILDDIR))/flanterm/src/flanterm_backends/fb.o: override CPPFL
     -DFLANTERM_FB_DISABLE_BUMP_ALLOC
 
 override NASMFLAGS_FOR_TARGET += \
+    -g \
     -Wall \
     -w-unknown-warning \
     -w-reloc \
-    $(WERROR_FLAG) \
-    -g
+    $(WERROR_FLAG)
+
+override NASMFLAGS_FOR_TARGET := \
+    $(patsubst -g,-g -F dwarf,$(NASMFLAGS_FOR_TARGET))
 
 ifeq ($(TARGET),bios)
     override CFLAGS_FOR_TARGET += \
@@ -77,7 +83,7 @@ ifeq ($(TARGET),bios)
         -DBIOS
     override NASMFLAGS_FOR_TARGET := \
         -f elf32 \
-        $(shell printf '%s' '$(NASMFLAGS_FOR_TARGET)' | $(SED) -E 's/(^|[[:space:]])-g($$|[[:space:]])/\1-g -F dwarf\2/g') \
+        $(NASMFLAGS_FOR_TARGET) \
         -DIA32_TARGET \
         -DBIOS
 endif
@@ -100,7 +106,7 @@ ifeq ($(TARGET),uefi-x86-64)
         -DUEFI
     override NASMFLAGS_FOR_TARGET := \
         -f elf64 \
-        $(shell printf '%s' '$(NASMFLAGS_FOR_TARGET)' | $(SED) -E 's/(^|[[:space:]])-g($$|[[:space:]])/\1-g -F dwarf\2/g') \
+        $(NASMFLAGS_FOR_TARGET) \
         -DX86_64_TARGET \
         -DUEFI
 endif
diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index fe54965b..4aae3ee9 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -49,7 +49,7 @@ override LDFLAGS_FOR_TARGET += \
 
 override NASMFLAGS_FOR_TARGET := \
     -f elf32 \
-    $(shell printf '%s' '$(NASMFLAGS_FOR_TARGET)' | $(SED) -E 's/(^|[[:space:]])-g($$|[[:space:]])/\1-g -F dwarf\2/g') \
+    $(patsubst -g,-g -F dwarf,$(NASMFLAGS_FOR_TARGET)) \
     -Wall \
     -w-unknown-warning \
     -w-reloc \