Unverified Commit 9f1da93b authored by Emily's avatar Emily Committed by GitHub
Browse files

llvmPackages.libllvm: fix enablePolly = false (#444806)

parents fd38ee43 b8424868
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@
  devExtraCmakeFlags ? [ ],
  getVersionFile,
  fetchpatch,
  # for tests
  libllvm,
}:

let
@@ -206,8 +208,6 @@ stdenv.mkDerivation (
      ++ lib.optionals enablePolly [
        # Just like the `gnu-install-dirs` patch, but for `polly`.
        (getVersionFile "llvm/gnu-install-dirs-polly.patch")
      ]
      ++ [
        # Just like the `llvm-lit-cfg` patch, but for `polly`.
        (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
      ]
@@ -591,8 +591,15 @@ stdenv.mkDerivation (

    checkTarget = "check-all";

    passthru = {
      # For the update script:
    passthru.monorepoSrc = monorepoSrc;
      inherit monorepoSrc;
      tests.withoutOptionalFeatures = libllvm.override {
        enablePFM = false;
        enablePolly = false;
        enableTerminfo = false;
      };
    };

    requiredSystemFeatures = [ "big-parallel" ];
    meta = llvm_meta // {