diff --git a/build-llvm.sh b/build-llvm.sh
index 0f30bbf..4e45e6a 100755
--- a/build-llvm.sh
+++ b/build-llvm.sh
@@ -140,7 +140,7 @@ cmake \
     -DLLVM_ENABLE_ASSERTIONS=$ASSERTS \
     -DLLVM_TARGETS_TO_BUILD="ARM;AArch64;X86" \
     -DLLVM_INSTALL_TOOLCHAIN_ONLY=$TOOLCHAIN_ONLY \
-    -DLLVM_TOOLCHAIN_TOOLS="llvm-ar;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata" \
+    -DLLVM_TOOLCHAIN_TOOLS="llvm-ar;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata;llvm-addr2line" \
     $CMAKEFLAGS \
     ..
 
diff --git a/install-wrappers.sh b/install-wrappers.sh
index 57dc7de..9e71a02 100755
--- a/install-wrappers.sh
+++ b/install-wrappers.sh
@@ -55,7 +55,7 @@ for arch in $ARCHS; do
         for exec in clang clang++ gcc g++ cc c99 c11 c++; do
             ln -sf clang-target-wrapper$CTW_SUFFIX $arch-w64-$target_os-$exec$CTW_LINK_SUFFIX
         done
-        for exec in ar ranlib nm objcopy strings strip; do
+        for exec in addr2line ar ranlib nm objcopy strings strip; do
             if [ -n "$HOST" ]; then
                 link_target=llvm-wrapper
             else
@@ -78,7 +78,7 @@ if [ -n "$EXEEXT" ]; then
     if [ -z "$HOST" ]; then
         HOST=$(./clang-$CLANG_MAJOR -dumpmachine | sed 's/-.*//')-w64-mingw32
     fi
-    for exec in clang clang++ gcc g++ cc c99 c11 c++ ar ranlib nm objcopy strings strip windres; do
+    for exec in clang clang++ gcc g++ cc c99 c11 c++ addr2line ar ranlib nm objcopy strings strip windres; do
         ln -sf $HOST-$exec$EXEEXT $exec$EXEEXT
     done
     for exec in ld objdump dlltool; do
diff --git a/strip-llvm.sh b/strip-llvm.sh
index f46e0c5..69a5d1d 100755
--- a/strip-llvm.sh
+++ b/strip-llvm.sh
@@ -51,7 +51,7 @@ for i in bugpoint c-index-test clang-* diagtool dsymutil git-clang-format hmapto
             rm -f $i
         fi
         ;;
-    llvm-ar|llvm-cvtres|llvm-dlltool|llvm-nm|llvm-objdump|llvm-ranlib|llvm-rc|llvm-readobj|llvm-strings|llvm-pdbutil|llvm-objcopy|llvm-strip|llvm-cov|llvm-profdata|llvm-wrapper)
+    llvm-ar|llvm-cvtres|llvm-dlltool|llvm-nm|llvm-objdump|llvm-ranlib|llvm-rc|llvm-readobj|llvm-strings|llvm-pdbutil|llvm-objcopy|llvm-strip|llvm-cov|llvm-profdata|llvm-addr2line|llvm-wrapper)
         ;;
     ld64.lld|wasm-ld)
         if [ -e $i ]; then