diff options
| author | Will Dietz <w@wdtz.org> | 2022-03-12 10:44:46 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2022-03-24 18:58:38 -0500 |
| commit | 7151381aab2fab8f97033681dbb4e461b1780da1 (patch) | |
| tree | 8cb8503ca3e4c600b310ec493437f2ff940826df /pkgs/development/compilers/llvm | |
| parent | 5e04d64aed16e8c068f7b41d2308aa450ab29dfd (diff) | |
| download | nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.tar nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.tar.gz nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.tar.bz2 nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.tar.lz nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.tar.xz nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.tar.zst nixpkgs-7151381aab2fab8f97033681dbb4e461b1780da1.zip | |
openmp: tests, few failures
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/14/openmp/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 7add0c7ed46..6ccfde29e28 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -5,6 +5,7 @@ , runCommand , cmake , llvm +, lit , clang-unwrapped , perl , pkg-config @@ -26,16 +27,20 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch ./fix-find-tool.patch + ./run-lit-directly.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped lit ]; buildInputs = [ llvm ]; - cmakeFlags = [ - "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails - ]; + doCheck = true; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch new file mode 100644 index 00000000000..1e952fdc36a --- /dev/null +++ b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake +--- a/cmake/OpenMPTesting.cmake ++++ b/cmake/OpenMPTesting.cmake +@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) + if (${OPENMP_STANDALONE_BUILD}) + set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) + add_custom_target(${target} +- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} ++ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} + COMMENT ${comment} + DEPENDS ${ARG_DEPENDS} + USES_TERMINAL |