From d07d21818b005b2b6c2b1b792e27e87dbbfddeda Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 30 Mar 2025 21:23:48 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.openmp: use lib.cmake functions --- pkgs/development/compilers/llvm/common/openmp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index e28c07efcae1..bee2a700eb02 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -88,11 +88,11 @@ stdenv.mkDerivation (finalAttrs: { (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 + (lib.cmakeBool "LIBOMPTARGET_BUILD_AMDGCN_BCLIB" false) # Building the AMDGCN device RTL fails ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ - "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" - "-DOPT_TOOL=${llvm}/bin/opt" - "-DLINK_TOOL=${llvm}/bin/llvm-link" + (lib.cmakeFeature "CLANG_TOOL" "${clang-unwrapped}/bin/clang") + (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt") + (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link") ] ++ devExtraCmakeFlags; meta = llvm_meta // {