[A] Re: [21.5] cflags broken, proposed fix