llvmPackages: Always put `libunwind` before `openmp`

This keeps the "main bootstrap" together.
launchpad/nixpkgs/master
John Ericson 3 years ago
parent 4caedc060f
commit 894f0c6ec8
  1. 3
      pkgs/development/compilers/llvm/10/default.nix
  2. 3
      pkgs/development/compilers/llvm/11/default.nix
  3. 1
      pkgs/development/compilers/llvm/12/default.nix
  4. 3
      pkgs/development/compilers/llvm/8/default.nix
  5. 3
      pkgs/development/compilers/llvm/9/default.nix

@ -188,13 +188,12 @@ let
libunwind = libraries.libunwind;
}));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
openmp = callPackage ./openmp.nix {};
});
in { inherit tools libraries; } // libraries // tools

@ -189,13 +189,12 @@ let
libunwind = libraries.libunwind;
}));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
openmp = callPackage ./openmp.nix {};
});
in { inherit tools libraries; } // libraries // tools

@ -236,7 +236,6 @@ let
});
openmp = callPackage ./openmp { inherit llvm_meta; };
});
in { inherit tools libraries; } // libraries // tools

@ -191,13 +191,12 @@ let
libunwind = libraries.libunwind;
}));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
openmp = callPackage ./openmp.nix {};
});
in { inherit tools libraries; } // libraries // tools

@ -191,13 +191,12 @@ let
libunwind = libraries.libunwind;
}));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
openmp = callPackage ./openmp.nix {};
});
in { inherit tools libraries; } // libraries // tools

Loading…
Cancel
Save