Index: tools/xcode-toolchain/CMakeLists.txt
===================================================================
--- tools/xcode-toolchain/CMakeLists.txt
+++ tools/xcode-toolchain/CMakeLists.txt
@@ -69,18 +69,6 @@
   set(COMPAT_VERSION 1)
 endif()
 
-execute_process(
-  COMMAND xcrun -find otool
-  OUTPUT_VARIABLE clang_path
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-  ERROR_FILE /dev/null
-)
-string(REGEX MATCH "(.*/Toolchains)/.*" toolchains_match ${clang_path})
-if(NOT toolchains_match)
-  message(FATAL_ERROR "Could not identify toolchain dir")
-endif()
-set(toolchains_dir ${CMAKE_MATCH_1})
-
 set(LLVMToolchainDir "${CMAKE_INSTALL_PREFIX}/Toolchains/LLVM${PACKAGE_VERSION}.xctoolchain/")
 
 add_custom_command(OUTPUT ${LLVMToolchainDir}
@@ -89,8 +77,17 @@
 add_custom_command(OUTPUT ${LLVMToolchainDir}/Info.plist
                   DEPENDS ${LLVMToolchainDir}
                   COMMAND ${CMAKE_COMMAND} -E remove ${LLVMToolchainDir}/Info.plist
-                  COMMAND /usr/libexec/PlistBuddy -c "Add:CFBundleIdentifier string org.llvm.${PACKAGE_VERSION}" "${LLVMToolchainDir}/Info.plist"
-                  COMMAND /usr/libexec/PlistBuddy -c "Add:CompatibilityVersion integer ${COMPAT_VERSION}" "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "<plist version=\"1.0\">" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "<dict>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "    <key>CFBundleIdentifier</key>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "    <string>org.llvm.${PACKAGE_VERSION}</string>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "    <key>CompatibilityVersion</key>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "    <integer>${COMPAT_VERSION}</integer>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "</dict>" >> "${LLVMToolchainDir}/Info.plist"
+                  COMMAND echo "</plist>" >> "${LLVMToolchainDir}/Info.plist"
+                  VERBATIM
                   )
 
 add_custom_target(install-xcode-toolchain