diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 15:05:42 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 15:05:42 +0000 |
| commit | 24728d6824d7c8ea23db306ebe5a709a7568f18d (patch) | |
| tree | 668b063484d93757d204f772a9dbf8f113f1e37e /tools | |
| parent | e73ad2d4ed5581a6243bf6a9a23d595bb3f75b2d (diff) | |
| download | chromium_src-24728d6824d7c8ea23db306ebe5a709a7568f18d.zip chromium_src-24728d6824d7c8ea23db306ebe5a709a7568f18d.tar.gz chromium_src-24728d6824d7c8ea23db306ebe5a709a7568f18d.tar.bz2 | |
Let package.sh keep libclang-rt.tsan on Linux x64.
Fix the Clang version (it's 3.2 already) in the comments.
BUG=128314
Review URL: https://chromiumcodereview.appspot.com/10389165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/clang/scripts/package.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/clang/scripts/package.sh b/tools/clang/scripts/package.sh index 8ee16d3..eb34581 100755 --- a/tools/clang/scripts/package.sh +++ b/tools/clang/scripts/package.sh @@ -57,18 +57,19 @@ else cp "${LLVM_LIB_DIR}/libFindBadConstructs.so" $PDIR/lib fi -# Copy built-in headers (lib/clang/3.0/include). +# Copy built-in headers (lib/clang/3.2/include). # libcompiler-rt puts all kinds of libraries there too, but we want only ASan. if [ "$(uname -s)" = "Darwin" ]; then - # Keep only Release+Asserts/lib/clang/3.1/lib/darwin/libclang_rt.asan_osx.a + # 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 else - # Keep only Release+Asserts/lib/clang/3.1/lib/linux/libclang_rt.asan-x86_64.a - # TODO(thakis): Make sure the 32bit version is kept too once that's built. - find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' | grep -v asan | \ - xargs rm - + # Keep only + # Release+Asserts/lib/clang/3.2/lib/linux/libclang_rt.{asan,tsan}-x86_64.a + # TODO(thakis): Make sure the 32bit version of ASan runtime is kept too once + # that's built. TSan runtime exists only for 64 bits. + find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' | \ + grep -v "asan\|tsan" | xargs rm fi cp -R "${LLVM_LIB_DIR}/clang" $PDIR/lib |