:: commit 016b0a6966017a8387b7ff1a3c24db468510abc2

diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index 4aae3ee9..bd00a1e3 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -31,6 +31,9 @@ override CFLAGS_FOR_TARGET += \
     -mabi=sysv \
     -mno-80387
 
+override CFLAGS_FOR_TARGET := \
+    $(patsubst -g,-gdwarf,$(CFLAGS_FOR_TARGET))
+
 override CPPFLAGS_FOR_TARGET := \
     -I . \
     -I tinf \
diff --git a/test/test.mk b/test/test.mk
index 647ff093..23963385 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -1,9 +1,4 @@
 include $(TOOLCHAIN_FILE)
-export CC_FOR_TARGET
-export LD_FOR_TARGET
-export OBJDUMP_FOR_TARGET
-export OBJCOPY_FOR_TARGET
-export READELF_FOR_TARGET
 
 override CC := $(CC_FOR_TARGET)
 CFLAGS = -O2 -g -Wall -Wextra