diff --git a/Golden_Repo/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb b/Golden_Repo/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb
index 460decd0176bba62c1bb3e2109d3f4472027279a..e8e927d8eb8c5c98e9b59dec494a71bc6a436355 100644
--- a/Golden_Repo/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb
+++ b/Golden_Repo/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb
@@ -13,7 +13,9 @@ site_contacts = 'sc@fz-juelich.de'
 # already specified as the toolchain.
 toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
 
-source_urls = ["https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s"]
+source_urls = [
+    "https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s"
+]
 sources = [
     'llvm-%(version)s.src.tar.xz',
     'clang-%(version)s.src.tar.xz',
@@ -27,15 +29,24 @@ sources = [
     'clang-tools-extra-%(version)s.src.tar.xz',
 ]
 checksums = [
-    '913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469',  # llvm-11.0.0.src.tar.xz
-    '0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209',  # clang-11.0.0.src.tar.xz
-    '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234',  # compiler-rt-11.0.0.src.tar.xz
-    'dcfadb8d11f2ea0743a3f19bab3b43ee1cb855e136bc81c76e2353cd76148440',  # polly-11.0.0.src.tar.xz
-    '2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c',  # openmp-11.0.0.src.tar.xz
-    'efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c',  # lld-11.0.0.src.tar.xz
-    '6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a',  # libcxx-11.0.0.src.tar.xz
-    '58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15',  # libcxxabi-11.0.0.src.tar.xz
-    'fed318f75d560d0e0ae728e2fb8abce71e9d0c60dd120c9baac118522ce76c09',  # clang-tools-extra-11.0.0.src.tar.xz
+    # llvm-11.0.0.src.tar.xz
+    '913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469',
+    # clang-11.0.0.src.tar.xz
+    '0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209',
+    # compiler-rt-11.0.0.src.tar.xz
+    '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234',
+    # polly-11.0.0.src.tar.xz
+    'dcfadb8d11f2ea0743a3f19bab3b43ee1cb855e136bc81c76e2353cd76148440',
+    # openmp-11.0.0.src.tar.xz
+    '2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c',
+    # lld-11.0.0.src.tar.xz
+    'efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c',
+    # libcxx-11.0.0.src.tar.xz
+    '6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a',
+    # libcxxabi-11.0.0.src.tar.xz
+    '58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15',
+    # clang-tools-extra-11.0.0.src.tar.xz
+    'fed318f75d560d0e0ae728e2fb8abce71e9d0c60dd120c9baac118522ce76c09',
 ]
 
 dependencies = [
@@ -78,10 +89,6 @@ build_extra_clang_tools = True
 
 skip_all_tests = True
 
-stage3_configopts = '-DLIBOMPTARGET_NVPTX_ENABLE_BCLIB=1'
-stage3_configopts += ' -DLIBOMPTARGET_NVPTX_CUDA_COMPILER=%(builddir)s/llvm.obj.2/bin/clang'
-stage3_configopts += ' -DLIBOMPTARGET_NVPTX_BC_LINKER=%(builddir)s/llvm.obj.2//bin/llvm-link'
-
 modluafooter = '''
    add_property("arch","gpu")
 '''