Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 6690)
+++ trunk/scconfig/hooks.c	(revision 6691)
@@ -281,8 +281,7 @@
 /* until we rewrite the generators in C */
 	require("fstools/awk",  0, 1);
 
-	if (istrue(get("/local/pcb/debug")))
-		require("cc/argstd/*", 0, 0);
+	require("cc/argstd/*", 0, 0);
 
 	require("cc/func_attr/unused/*", 0, 0);
 	require("cc/inline", 0, 0);
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 6690)
+++ trunk/src/Makefile.in	(revision 6691)
@@ -1,5 +1,5 @@
 # TODO default compiler flags
-put /local/pcb/CFLAGS [@ @cc/cflags@ @?cc/argstd/std_c99@ @]
+put /local/pcb/CFLAGS cc/cflags
 append /local/pcb/CFLAGS cc/fpic
 append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src_3rd/liblihata -Iicons -DHAVE_CONFIG_H}
 append /local/pcb/LDFLAGS cc/ldflags
@@ -251,7 +251,7 @@
 OBJS_C99=@/local/pcb/OBJS_C99@
 OBJS_UTIL=@/local/pcb/OBJS_UTIL@
 SRCS=@/local/pcb/SRCS@
-CFLAGS=@/local/pcb/CFLAGS@
+CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/CFLAGS@
 C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@
 LDFLAGS=@/local/pcb/LDFLAGS@
 LIBS=@/local/pcb/LIBS@ -lm @?/target/libs/ldl@