Index: tools/clang/scripts/package.py |
diff --git a/tools/clang/scripts/package.py b/tools/clang/scripts/package.py |
index 151cb357820101e56c6189c11eb37a2915c35a47..d0aded21d6e3bef6d325687c6006124b02b8711c 100755 |
--- a/tools/clang/scripts/package.py |
+++ b/tools/clang/scripts/package.py |
@@ -26,6 +26,8 @@ LLVM_BOOTSTRAP_INSTALL_DIR = os.path.join(THIRD_PARTY_DIR, |
LLVM_BUILD_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-build') |
LLVM_RELEASE_DIR = os.path.join(LLVM_BUILD_DIR, 'Release+Asserts') |
LLVM_LTO_GOLD_PLUGIN_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-lto-gold-plugin') |
+BINUTILS_LIB_DIR = os.path.join(THIRD_PARTY_DIR, 'binutils', 'Linux_x64', |
+ 'Release', 'lib') |
STAMP_FILE = os.path.join(LLVM_BUILD_DIR, 'cr_build_revision') |
@@ -322,6 +324,12 @@ def main(): |
shutil.copytree(os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'include', 'c++'), |
os.path.join(pdir, 'include', 'c++')) |
+ # Copy tcmalloc from the binutils package. |
+ # FIXME: We should eventually be building our own copy. |
+ if sys.platform.startswith('linux'): |
+ shutil.copy(os.path.join(BINUTILS_LIB_DIR, 'libtcmalloc_minimal.so.4'), |
+ os.path.join(pdir, 'lib')) |
+ |
# Copy buildlog over. |
shutil.copy('buildlog.txt', pdir) |