--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -17,16 +17,17 @@ macosx64/debug:
         actions: [get-secrets build update]
         config:
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: cross-debug
         tooltool-downloads: internal
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: firefox
@@ -44,16 +45,17 @@ macosx64/opt:
         using: mozharness
         actions: [get-secrets build update]
         config:
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: internal
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache
 
 macosx64-dmd/opt:
     description: "MacOS X x64 DMD Cross-compile"
     index:
         product: firefox
@@ -73,16 +75,17 @@ macosx64-dmd/opt:
         config:
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: dmd
         secrets: true
         tooltool-downloads: internal
     run-on-projects: [ ]
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache
 
 macosx64-devedition/opt:
     description: "MacOS X Dev Edition x64"
     index:
         product: devedition
@@ -101,16 +104,17 @@ macosx64-devedition/opt:
         actions: [get-secrets build update]
         config:
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: internal
     run-on-projects: ['mozilla-beta',]
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache
 
 macosx64-noopt/debug:
     description: "MacOS X x64 No-optimize Debug"
     index:
         product: firefox
@@ -133,16 +137,17 @@ macosx64-noopt/debug:
             - balrog/production.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: cross-noopt-debug
         tooltool-downloads: internal
         keep-artifacts: false
     run-on-projects: [ 'trunk', 'try' ]
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache
 
 macosx64-add-on-devel/opt:
     description: "MacOS X x64 add-on-devel"
     index:
         product: firefox
@@ -163,16 +168,17 @@ macosx64-add-on-devel/opt:
             - builds/releng_base_mac_64_cross_builds.py
             - balrog/production.py
        script: "mozharness/scripts/fx_desktop_build.py"
        secrets: true
        custom-build-variant-cfg: add-on-devel
        tooltool-downloads: internal
     run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache
 
 macosx64-nightly/opt:
     description: "MacOS X x64 Cross-compile Nightly"
     attributes:
         nightly: true
@@ -195,11 +201,12 @@ macosx64-nightly/opt:
         config:
             - builds/releng_base_mac_64_cross_builds.py
             - disable_signing.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: internal
     toolchains:
+        - linux64-cctools-port
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-sccache

--- a/taskcluster/ci/toolchain/macosx.yml
+++ b/taskcluster/ci/toolchain/macosx.yml
@@ -19,16 +19,17 @@ macosx64-clang:
         using: toolchain-script
         script: build-clang-macosx.sh
         tooltool-downloads: internal
         resources:
             - 'build/build-clang/**'
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/clang.tar.xz
     toolchains:
+        - linux64-cctools-port
         - linux64-gcc
         - linux64-sccache
 
 macosx64-clang-tidy:
     description: "Clang-tidy build"
     index:
         product: static-analysis
         job-name: macosx64-clang-tidy
@@ -48,16 +49,17 @@ macosx64-clang-tidy:
         script: build-clang-tidy-macosx.sh
         tooltool-downloads: internal
         resources:
             - 'build/clang-plugin/**'
             - 'build/build-clang/**'
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/clang-tidy.tar.xz
     toolchains:
+        - linux64-cctools-port
         - linux64-gcc
         - linux64-sccache
 
 macosx64-cctools-port:
     description: "cctools-port toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
@@ -72,10 +74,11 @@ macosx64-cctools-port:
     run:
         using: toolchain-script
         script: build-cctools-port-macosx.sh
         tooltool-downloads: internal
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/cctools.tar.bz2
     toolchains:
+        - linux64-cctools-port
         - linux64-gcc
         - linux64-sccache