diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | package.nix | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -269,6 +269,8 @@ nix = pkgs.callPackage ./package.nix { inherit versionSuffix officialRelease buildUnreleasedNotes; inherit (pkgs) build-release-notes; + # Required since we don't support gcc stdenv + stdenv = pkgs.clangStdenv; internalApiDocs = true; busybox-sandbox-shell = pkgs.busybox-sandbox-shell; }; @@ -326,6 +328,8 @@ inherit (nixpkgs) pkgs; in pkgs.callPackage ./package.nix { + # Required since we don't support gcc stdenv + stdenv = pkgs.clangStdenv; versionSuffix = ""; lintInsteadOfBuild = true; }; diff --git a/package.nix b/package.nix index e869fb74f..4bce7cb5e 100644 --- a/package.nix +++ b/package.nix @@ -112,7 +112,7 @@ }: # gcc miscompiles coroutines at least until 13.2, possibly longer -assert stdenv.cc.isClang || lintInsteadOfBuild || internalApiDocs; +assert stdenv.cc.isClang; let inherit (__forDefaults) canRunInstalled; @@ -274,6 +274,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals lintInsteadOfBuild [ # required for a wrapped clang-tidy llvmPackages.clang-tools + # load-bearing order (just as below); the actual stdenv wrapped clang + # needs to precede the unwrapped clang in PATH such that calling `clang` + # can compile things. + stdenv.cc # required for run-clang-tidy llvmPackages.clang-unwrapped ]; |