Build system has changed slightly, necessitating the change in makeFlags. (cherry picked from commit a05062d0dd1af7b22d1a7e88cbf47d042dc08568)
Build system has changed slightly, necessitating the change in makeFlags. (cherry picked from commit a05062d0dd1af7b22d1a7e88cbf47d042dc08568)