Commit fa648b28 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

Revert "llvmPackages.openmp: Make OMPD customisable, add missing Python dependency" 

This reverts commit ecd9d988.

Mass rebuild accidentally merged to master.
parent c006d5f0

pkgs/development/compilers/llvm/common/openmp/default.nix

+1 −12
Original line number Diff line number Diff line
@@ -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"