Fix --build-bottle CFLAGS.

The CFLAGS were previously not generic enough.

References #18944.
References #19179.