ompss2: fix to the last release

bsc/llvm-ompss2/clang-git.nix

@@ -0,0 +1,79 @@
+{
+  stdenv
+, fetchgit
+, cmake
+, lld
+, bash
+, python3
+, perl
+, which
+, libelf
+, libffi
+, pkg-config
+, enableDebug ? true
+}:
+
+stdenv.mkDerivation rec {
+  version = "${src.shortRev}";
+  pname = "clang-ompss2";
+  enableParallelBuilding = true;
+  isClang = true;
+  #isGNU = true;
+
+  passthru = {
+    CC = "clang";
+    CXX = "clang++";
+  };
+
+  isClangWithOmpss = true;
+
+  buildInputs = [
+    which
+    bash
+    python3
+    perl
+    cmake
+    lld
+    libelf
+    libffi
+    pkg-config
+  ];
+
+  hardeningDisable = [ "fortify" ];
+
+  cmakeBuildType = if enableDebug then "Debug" else "Release";
+
+  dontUseCmakeBuildDir = true;
+  enableAssertions = if enableDebug then "ON" else "OFF";
+
+  preConfigure = ''
+    mkdir -p build
+    cd build
+    cmakeDir="../llvm"
+    cmakeFlagsArray=(
+      "-DLLVM_ENABLE_LLD=ON"
+      "-DCMAKE_CXX_FLAGS_DEBUG=-g -ggnu-pubnames"
+      "-DCMAKE_EXE_LINKER_FLAGS_DEBUG=-Wl,-gdb-index"
+      "-DLLVM_LIT_ARGS=-sv --xunit-xml-output=xunit.xml"
+      "-DLLVM_ENABLE_PROJECTS=clang;openmp;compiler-rt"
+      "-DLLVM_ENABLE_ASSERTIONS=${enableAssertions}"
+      "-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
+    )
+  '';
+
+  # Remove support for GNU and Intel Openmp
+  postInstall = ''
+    rm $out/lib/libgomp*
+    rm $out/lib/libiomp*
+  '';
+
+# About "-DCLANG_DEFAULT_NANOS6_HOME=${nanos6}", we could specify a default
+# nanos6 installation, but this is would require a recompilation of clang each
+# time nanos6 is changed. Better to use the environment variable NANOS6_HOME,
+# and specify nanos6 at run time.
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm02.bsc.es/llvm-ompss/llvm-mono.git";
+    ref = "master";
+  };
+}

bsc/llvm-ompss2/clang.nix

@@ -1,6 +1,6 @@
 {
   stdenv
-, fetchgit
+, fetchFromGitHub
 , cmake
 , lld
 , bash
@@ -10,15 +10,22 @@
 , libelf
 , libffi
 , pkg-config
-, enableDebug ? true
+, enableDebug ? false
 }:
 
 stdenv.mkDerivation rec {
-  version = "${src.shortRev}";
+  version = "2020.11";
   pname = "clang-ompss2";
+
+  src = fetchFromGitHub {
+    owner = "bsc-pm";
+    repo = "llvm";
+    rev = "github-release-${version}";
+    sha256 = "00z3xlw36lbiz84a47k95gin9fzsni5jd1f71dpg5l2qjy961qma";
+  };
+
   enableParallelBuilding = true;
   isClang = true;
-  #isGNU = true;
 
   passthru = {
     CC = "clang";
@@ -39,6 +46,9 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  # Error with -D_FORTIFY_SOURCE=2, see https://bugs.gentoo.org/636604:
+  # /build/source/compiler-rt/lib/tsan/dd/dd_interceptors.cpp:225:20:
+  # error: redefinition of 'realpath'
   hardeningDisable = [ "fortify" ];
 
   cmakeBuildType = if enableDebug then "Debug" else "Release";
@@ -71,9 +81,4 @@ stdenv.mkDerivation rec {
 # nanos6 installation, but this is would require a recompilation of clang each
 # time nanos6 is changed. Better to use the environment variable NANOS6_HOME,
 # and specify nanos6 at run time.
-
-  src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/llvm-ompss/llvm-mono.git";
-    ref = "master";
-  };
 }