Changes to the Clang packaging script:

tools/clang/scripts/package.sh

 #!/bin/bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script will check out llvm and clang, and then package the results up
 # to a tgz file.
 
+gcc_toolchain=
+
 # Parse command line options.
 while [[ $# > 0 ]]; do
   case $1 in
     --gcc-toolchain)
       shift
       if [[ $# == 0 ]]; then
         echo "--gcc-toolchain requires an argument."
         exit 1
       fi
       if [[ -x "$1/bin/gcc" ]]; then
@@ skipping 84 matching lines @@
 cp "${LLVM_LIB_DIR}/libBlinkGCPlugin.${SO_EXT}" $PDIR/lib
 
 if [[ -n "${gcc_toolchain}" ]]; then
   # Copy the stdlibc++.so.6 we linked Clang against so it can run.
   cp "${LLVM_LIB_DIR}/libstdc++.so.6" $PDIR/lib
 fi
 
 # Copy built-in headers (lib/clang/3.2/include).
 # libcompiler-rt puts all kinds of libraries there too, but we want only some.
 if [ "$(uname -s)" = "Darwin" ]; then
-  # Keep only
-  # Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.{asan,profile}_osx*
+  # Keep only the OSX (ASan and profile) and iossim (ASan) runtime libraries:
+  # Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.{asan,profile}_*
   find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/darwin*' \
-       ! -name '*asan_osx*' ! -name '*profile_osx*' | xargs rm
-  # Fix LC_ID_DYLIB for the ASan dynamic library to be relative to
+       ! -name '*asan_osx*' ! -name '*asan_iossim*' ! -name '*profile_osx*' | \
+      xargs rm
+  # Fix LC_ID_DYLIB for the ASan dynamic libraries to be relative to
   # @executable_path.
   # TODO(glider): this is transitional. We'll need to fix the dylib name
-  # either in our build system, or in Clang. See also http://crbug.com/170629.
-  ASAN_DYLIB_NAME=libclang_rt.asan_osx_dynamic.dylib
-  ASAN_DYLIB=$(find "${LLVM_LIB_DIR}/clang" -type f -path "*${ASAN_DYLIB_NAME}")
-  install_name_tool -id @executable_path/${ASAN_DYLIB_NAME} "${ASAN_DYLIB}"
+  # either in our build system, or in Clang. See also http://crbug.com/344836.
+  ASAN_DYLIB_NAMES="libclang_rt.asan_osx_dynamic.dylib
+    libclang_rt.asan_iossim_dynamic.dylib"
+  for ASAN_DYLIB_NAME in $ASAN_DYLIB_NAMES
+  do
+    ASAN_DYLIB=$(find "${LLVM_LIB_DIR}/clang" \
+                      -type f -path "*${ASAN_DYLIB_NAME}")
+    install_name_tool -id @executable_path/${ASAN_DYLIB_NAME} "${ASAN_DYLIB}"
+  done
 else
   # Keep only
   # Release+Asserts/lib/clang/*/lib/linux/libclang_rt.{[atm]san,profile,ubsan}-*.a
   find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' \
        ! -name '*[atm]san*' ! -name '*profile*' ! -name '*ubsan*' | xargs rm
 fi
 
 cp -R "${LLVM_LIB_DIR}/clang" $PDIR/lib
 
 tar zcf $PDIR.tgz -C $PDIR bin lib buildlog.txt
 
 if [ "$(uname -s)" = "Darwin" ]; then
   PLATFORM=Mac
 else
   PLATFORM=Linux_x64
 fi
 
 echo To upload, run:
 echo gsutil cp -a public-read $PDIR.tgz \
      gs://chromium-browser-clang/$PLATFORM/$PDIR.tgz