diff options
| author | mcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 23:37:23 +0000 |
|---|---|---|
| committer | mcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 23:37:23 +0000 |
| commit | 913ae6685df2189f497a623d453dbc93d0f22394 (patch) | |
| tree | 4e76038a27c2056037bc8eedf2d21669c2b4004d /tools/clang | |
| parent | c4939849e7f788a4dc5c705a0925188b42f2953f (diff) | |
| download | chromium_src-913ae6685df2189f497a623d453dbc93d0f22394.zip chromium_src-913ae6685df2189f497a623d453dbc93d0f22394.tar.gz chromium_src-913ae6685df2189f497a623d453dbc93d0f22394.tar.bz2 | |
Include libclang_rt.profile in Clang packaging
The --coverage switch to Clang requires the libclang_rt.profile
runtime libraries. The Mac native_client coverage bot uses this.
BUG= none
TEST= run locally on linux and mac
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/23202012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rwxr-xr-x | tools/clang/scripts/package.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tools/clang/scripts/package.sh b/tools/clang/scripts/package.sh index 582125b..f57a28b 100755 --- a/tools/clang/scripts/package.sh +++ b/tools/clang/scripts/package.sh @@ -62,11 +62,12 @@ cp "${LLVM_LIB_DIR}/libFindBadConstructs.${SO_EXT}" $PDIR/lib cp "${LLVM_LIB_DIR}/libprofile_rt.${SO_EXT}" $PDIR/lib # Copy built-in headers (lib/clang/3.2/include). -# libcompiler-rt puts all kinds of libraries there too, but we want only ASan. +# 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/3.2/lib/darwin/libclang_rt.asan_osx.a - find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/darwin*' | grep -v asan | \ - xargs rm + # Keep only + # Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.{asan,profile}_osx* + 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 # @executable_path. # TODO(glider): this is transitional. We'll need to fix the dylib name @@ -76,11 +77,9 @@ if [ "$(uname -s)" = "Darwin" ]; then install_name_tool -id @executable_path/${ASAN_DYLIB_NAME} "${ASAN_DYLIB}" else # Keep only - # Release+Asserts/lib/clang/3.2/lib/linux/libclang_rt.{a,t,m}san-x86_64.a - # TODO(thakis): Make sure the 32bit version of ASan runtime is kept too once - # that's built. TSan and MSan runtimes exist only for 64 bits. - find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' | \ - grep -v "asan\|tsan\|msan" | xargs rm + # Release+Asserts/lib/clang/*/lib/linux/libclang_rt.{[atm]san,profile}-*.a + find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' \ + ! -name '*[atm]san*' ! -name '*profile*' | xargs rm fi cp -R "${LLVM_LIB_DIR}/clang" $PDIR/lib |