Updated bootstrap to search for xctool.sh