updated workaround for xcrun woes