talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
This reverts commit ecd9d98879729b38bc3c347b9f2d2708f7027f5b.

Mass rebuild accidentally merged to master.
This commit is contained in:
Alyssa Ross 2025-02-08 12:48:22 +01:00
parent c006d5f063
commit fa648b2835
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/llvm/common/openmp/default.nix
View File

@ -14,15 +14,9 @@
, clang-unwrapped , clang-unwrapped
, perl , perl
, pkg-config , pkg-config
, python3
, version , version
, devExtraCmakeFlags ? [] , devExtraCmakeFlags ? []
, ompdSupport ? true
, ompdGdbSupport ? ompdSupport
}: }:
assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!";
let let
pname = "openmp"; pname = "openmp";
src' = src' =
@ -59,14 +53,9 @@ stdenv.mkDerivation (rec {
buildInputs = [ buildInputs = [
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
] ++ lib.optionals (ompdSupport && ompdGdbSupport) [
python3
]; ];
cmakeFlags = [ cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [
(lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
(lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
] ++ lib.optionals (lib.versions.major release_version == "13") [
"-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails
] ++ lib.optionals (lib.versionAtLeast release_version "14") [ ] ++ lib.optionals (lib.versionAtLeast release_version "14") [
"-DCLANG_TOOL=${clang-unwrapped}/bin/clang" "-DCLANG_TOOL=${clang-unwrapped}/bin/clang"