Correctly update CPPFLAGS

Looks like CPPFLAGS should really be getting updated and pushed back up the tree.