Folded GCC_CFLAG into CFLAGS
Update for libutil/libpromises split