Fix XLC build

One commit + cmake subtree update (thx to Daniel)