Add back in CFLAGS and CXXFLAGS