Misc. formatting tweaks, ensure that SDKROOT gets passed even if xcrun is in a multicall state