Upstream 3.0.46~50
Add CFLAGS Option