cherry-pick a cc warning fix
Source for buildrump.sh git rev 2331f8f2aacbfed700c27ae1c0a5f1042218c51d