diff options
| author | jfb@chromium.org <jfb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 21:08:46 +0000 |
|---|---|---|
| committer | jfb@chromium.org <jfb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 21:08:46 +0000 |
| commit | ac2e4c38089d2bcc430bebc6da9eb40d9b8e985e (patch) | |
| tree | 1f0088b661baa47c38e7f4620abfd849394235cd | |
| parent | 50f99665ea1c145f0e96bcf94b66e6b7816ac2a3 (diff) | |
| download | chromium_src-ac2e4c38089d2bcc430bebc6da9eb40d9b8e985e.zip chromium_src-ac2e4c38089d2bcc430bebc6da9eb40d9b8e985e.tar.gz chromium_src-ac2e4c38089d2bcc430bebc6da9eb40d9b8e985e.tar.bz2 | |
Ship profile_rt with Clang.
NaCl's Mac coverage bots have been broken since the GCC upgrade, and it
seems like this Apple GCC version has bugs that won't get fixed. As this
week's NaCl sheriff I'll start migrating our NaCl Mac bots to use LLVM,
which is what we build and ship with anyways.
I therefore need LLVM's profile_rt library for the coverage bots,
otherwise a Mac build will grab the system one which would be a Bad
Thing.
My change merely packages profile_rt so that the next Clang update has
it. The update should be separate.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3283
R= thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12388025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185970 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | tools/clang/scripts/package.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tools/clang/scripts/package.sh b/tools/clang/scripts/package.sh index 2ec04cf..582125b 100755 --- a/tools/clang/scripts/package.sh +++ b/tools/clang/scripts/package.sh @@ -42,6 +42,12 @@ mkdir $PDIR mkdir $PDIR/bin mkdir $PDIR/lib +if [ "$(uname -s)" = "Darwin" ]; then + SO_EXT="dylib" +else + SO_EXT="so" +fi + # Copy buildlog over. cp buildlog.txt $PDIR/ @@ -52,11 +58,8 @@ cp "${LLVM_BIN_DIR}/llvm-symbolizer" $PDIR/bin/ # Copy plugins. Some of the dylibs are pretty big, so copy only the ones we # care about. -if [ "$(uname -s)" = "Darwin" ]; then - cp "${LLVM_LIB_DIR}/libFindBadConstructs.dylib" $PDIR/lib -else - cp "${LLVM_LIB_DIR}/libFindBadConstructs.so" $PDIR/lib -fi +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. |