Actually add -stc=gnu99 for nacl builds.
Add CXX to Makefile.in
Remove unused function