--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -26,17 +26,17 @@ FLAGS="-target x86_64-apple-darwin11 -B 
 
 export CC="$topsrcdir/clang/bin/clang $FLAGS"
 export CXX="$topsrcdir/clang/bin/clang++ $FLAGS"
 export CPP="$topsrcdir/clang/bin/clang $FLAGS -E"
 export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
 export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
 export BINDGEN_CFLAGS="$FLAGS"
 export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-
-export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
+export DSYMUTIL=$topsrcdir/llvm-dsymutil/bin/llvm-dsymutil
 export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
 export DMG_TOOL=$topsrcdir/dmg/dmg
 export HFS_TOOL=$topsrcdir/dmg/hfsplus
 
 export HOST_CC="$topsrcdir/clang/bin/clang"
 export HOST_CXX="$topsrcdir/clang/bin/clang++"
 export HOST_CPP="$topsrcdir/clang/bin/clang -E"
 export HOST_CFLAGS="-g"

--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -22,16 +22,17 @@ macosx64/debug:
         secrets: true
         custom-build-variant-cfg: cross-debug
         tooltool-downloads: internal
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: firefox
         job-name: macosx64-opt
@@ -53,16 +54,17 @@ macosx64/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: internal
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache
 
 macosx64-dmd/opt:
     description: "MacOS X x64 DMD Cross-compile"
     index:
         product: firefox
         job-name: macosx64-dmd-opt
@@ -87,16 +89,17 @@ macosx64-dmd/opt:
         secrets: true
         tooltool-downloads: internal
     run-on-projects: []
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache
 
 macosx64-devedition-nightly/opt:
     description: "MacOS X Dev Edition x64 Nightly"
     attributes:
         nightly: true
     shipping-phase: build
@@ -127,16 +130,17 @@ macosx64-devedition-nightly/opt:
         tooltool-downloads: internal
         custom-build-variant-cfg: devedition
     run-on-projects: ['mozilla-beta']
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache
 
 macosx64-noopt/debug:
     description: "MacOS X x64 No-optimize Debug"
     index:
         product: firefox
         job-name: macosx64-noopt-debug
@@ -162,16 +166,17 @@ macosx64-noopt/debug:
         tooltool-downloads: internal
         keep-artifacts: false
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache
 
 macosx64-add-on-devel/opt:
     description: "MacOS X x64 add-on-devel"
     index:
         product: firefox
         job-name: macosx64-add-on-devel
@@ -196,16 +201,17 @@ macosx64-add-on-devel/opt:
         custom-build-variant-cfg: add-on-devel
         tooltool-downloads: internal
     run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache
 
 macosx64-nightly/opt:
     description: "MacOS X x64 Cross-compile Nightly"
     attributes:
         nightly: true
     shipping-phase: build
@@ -234,10 +240,11 @@ macosx64-nightly/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: internal
     toolchains:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
+        - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-sccache

--- a/taskcluster/ci/searchfox/kind.yml
+++ b/taskcluster/ci/searchfox/kind.yml
@@ -69,16 +69,17 @@ jobs:
             secrets: true
             tooltool-downloads: internal
             keep-artifacts: false
         toolchains:
             - linux64-cctools-port
             - linux64-clang
             - linux64-hfsplus
             - linux64-libdmg
+            - linux64-llvm-dsymutil
             - linux64-rust-macos
 
     # NOTE: Windows Searchfox jobs aren't working quite yet (bug 1418415).
 
     win32-searchfox/debug:
         description: "Win32 Searchfox Debug (clang-cl)"
         index:
             product: firefox