Fix bootstrap xcode check for future
More changes for future bootstrapping
Now works in future as well as past