ocamlbuild: minor fixes related to camlp4 and cross-compilation