diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index d7502df8fd57f03..483ce5526cf20fd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -175,7 +175,7 @@ let
       passthru.tests = lib.warn "Use `stdenv.tests` instead. `passthru` is a `mkDerivation` detail." stdenv.tests;
 
       # FIXME: hack to keep OfBorg moving; remove this later
-      enableGccExternalBootstrapForStdenv = buildPlatform == hostPlatform && !hostPlatform.isAarch64;
+      enableGccExternalBootstrapForStdenv = buildPlatform == hostPlatform;
     }
 
     # Propagate any extra attributes.  For instance, we use this to
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e1d17b31f94f75..6b3b7f6d4f7671b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14057,7 +14057,7 @@ with pkgs;
   inherit (let
       num =
         if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
-        else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9
+        else if (targetPlatform.isAarch64 && stdenv.isLinux && !stdenv.enableGccExternalBootstrapForStdenv) then 9
         else 11;
       numS = toString num;
     in {