This allows user provided CFLAGS to override the computed
CFLAGS.  As before the user can still use bad CFLAGs.

Adjust tests to match.