--- crtools-0.4/Makefile
+++ crtools-0.4/Makefile
@@ -90,13 +90,6 @@
 	WARNINGS += -Werror
 endif
 
-ifeq ($(DEBUG),1)
-	DEFINES += -DCR_DEBUG
-	CFLAGS	+= -O0 -ggdb3
-else
-	CFLAGS	+= -O2
-endif
-
 CFLAGS		+= $(WARNINGS) $(DEFINES)
 SYSCALL-LIB	:= arch/$(ARCH)/syscalls.built-in.o
 ARCH-LIB	:= arch/$(ARCH)/crtools.built-in.o
@@ -148,7 +141,7 @@
 
 $(PROGRAM): $(SYSCALL-LIB) $(ARCH-LIB) pie/util-net.o protobuf/built-in.o built-in.o
 	$(E) "  LINK    " $@
-	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) -o $@
+	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
 zdtm: all
 	$(Q) $(MAKE) -C test/zdtm all
--- crtools-0.4/test/zdtm/lib/Makefile
+++ crtools-0.4/test/zdtm/lib/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.inc
 
-CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+CFLAGS	= -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 
 LIB	= libzdtmtst.a
 
--- crtools-0.4/test/zdtm/live/static/Makefile
+++ crtools-0.4/test/zdtm/live/static/Makefile
@@ -3,7 +3,7 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
-CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+CFLAGS	= -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 
 TST_NOFILE	=				\
 		busyloop00			\
--- crtools-0.4/test/zdtm/live/streaming/Makefile
+++ crtools-0.4/test/zdtm/live/streaming/Makefile
@@ -3,7 +3,7 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
-CFLAGS	= -g -O2 -Wall -Werror -fno-strict-aliasing
+CFLAGS	= -Wall -fno-strict-aliasing
 
 TST_NOFILE	=	\
 		pipe_loop00	\
--- crtools-0.4/test/zdtm/live/transition/Makefile
+++ crtools-0.4/test/zdtm/live/transition/Makefile
@@ -3,7 +3,7 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
-CFLAGS	= -g -O2 -Wall -Werror
+CFLAGS	= -Wall
 
 TST_NOFILE	=	\
 		file_read 	\