Merge pull request #320371 from techknowlogick/teleport-wasm-broken

teleport: resolve broken for non-wasm builds
2024-06-17 22:36:58 -04:00
parent 31e107dc56 aff01c1b1d
commit 7e22655fd2
1 changed files with 5 additions and 2 deletions
@@ -182,7 +182,10 @@ buildGoModule rec {
    # which occupies more than 31 bits of address space.
    broken = stdenv.hostPlatform.parsed.cpu.bits < 64 ||
      # See comment about wasm32-unknown-unknown in rustc.nix.
-      lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
-      !stdenv.hostPlatform.gcc.thumb or true;
+      # version 15 is the first that starts to use wasm
+      (lib.versionAtLeast version "15") && (
+        lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] ||
+        !stdenv.hostPlatform.gcc.thumb or true
+      );
  };
 }