Revert "llvmPackages.openmp: Make OMPD customisable, add missing Python dependency"
This reverts commit ecd9d98879729b38bc3c347b9f2d2708f7027f5b. Mass rebuild accidentally merged to master.
This commit is contained in:
parent
c006d5f063
commit
fa648b2835
@ -14,15 +14,9 @@
|
||||
, clang-unwrapped
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, version
|
||||
, devExtraCmakeFlags ? []
|
||||
, ompdSupport ? true
|
||||
, ompdGdbSupport ? ompdSupport
|
||||
}:
|
||||
|
||||
assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!";
|
||||
|
||||
let
|
||||
pname = "openmp";
|
||||
src' =
|
||||
@ -59,14 +53,9 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
] ++ lib.optionals (ompdSupport && ompdGdbSupport) [
|
||||
python3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
|
||||
(lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
|
||||
] ++ lib.optionals (lib.versions.major release_version == "13") [
|
||||
cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [
|
||||
"-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails
|
||||
] ++ lib.optionals (lib.versionAtLeast release_version "14") [
|
||||
"-DCLANG_TOOL=${clang-unwrapped}/bin/clang"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user