diff --git a/Programming/clang/build b/Programming/clang/build
index c3a9466..b04bd38 100755
--- a/Programming/clang/build
+++ b/Programming/clang/build
@@ -1,9 +1,7 @@
 #!/usr/bin/env modbuild
 
 pbuild::set_download_url \
-	"https://github.com/llvm/llvm-project/releases/download/llvmorg-${V_PKG}/llvm-project-${V_PKG}.tar.xz"
-
-#pbuild::set_sha256sum "openmpi-3.1.2.tar.bz2:c654ed847f34a278c52a15c98add40402b4a90f0c540779f1ae6c489af8a76c5"
+	"https://github.com/llvm/llvm-project/releases/download/llvmorg-${V_PKG}/llvm-project-${V_PKG}.src.tar.xz"
 
 pbuild::add_to_group 'Programming'
 #pbuild::install_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
@@ -13,12 +11,14 @@ pbuild::configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DLLVM_ENABLE_PROJECTS=clang \
+		-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libunwind;lldb;lld;openmp" \
+		-DGCC_INSTALL_PREFIX="${GCC_DIR}" \
 		-G "Unix Makefiles" \
-		../src/llvm/ \
+		"${SRC_DIR}/llvm" \
 		|| exit 1
 }
 
 pbuild::post_install() {
+	# :FIXME: copy libstdc++ and libgcc from used gcc to $PREFIX/lib64
 	:
 }
diff --git a/Programming/clang/files/variants.rhel6 b/Programming/clang/files/variants.rhel6
index b97cf8e..212a557 100644
--- a/Programming/clang/files/variants.rhel6
+++ b/Programming/clang/files/variants.rhel6
@@ -1 +1 @@
-clang/10.0.1	unstable b:cmake/3.15.5 b:gcc/8.4.0 b:Python/3.8.4
+clang/10.0.1	stable	b:cmake/3.15.5 b:gcc/8.4.0 b:Python/3.8.4
diff --git a/Programming/clang/files/variants.rhel7 b/Programming/clang/files/variants.rhel7
new file mode 100644
index 0000000..75c9098
--- /dev/null
+++ b/Programming/clang/files/variants.rhel7
@@ -0,0 +1 @@
+clang/12.0.0_rhel7	stable	b:cmake/3.15.5 b:gcc/9.3.0 b:Python/3.8.4 b:xz/5.2.4 b:binutils/2.29