[PATCH 2/2] Make buildflags optional