[frobtads/f25] (4 commits) ...Fix the build flags