From ed950042ca5831b20091948e48b6ea70193ad199 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Thu, 3 Dec 2020 16:44:10 +0000 Subject: [PATCH 1/4] Clang: build lldb, don't disable optarch --- easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb index 746d496a831d..7bfa419ec95f 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb @@ -18,8 +18,6 @@ description = """C, C++, Objective-C compiler, based on LLVM. Does not # Clang also depends on libstdc++ during runtime, but this dependency is # already specified as the toolchain. toolchain = {'name': 'GCCcore', 'version': '9.3.0'} -# Do not set optarch to True: it will cause the build to fail -toolchainopts = {'optarch': False} source_urls = ["https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s"] sources = [ @@ -30,6 +28,8 @@ sources = [ 'openmp-%(version)s.src.tar.xz', # Also include the LLVM linker 'lld-%(version)s.src.tar.xz', + # Also include the LLVM debugger + 'lldb-%(version)s.src.tar.xz', 'libcxx-%(version)s.src.tar.xz', 'libcxxabi-%(version)s.src.tar.xz', ] @@ -40,6 +40,7 @@ checksums = [ 'dcfadb8d11f2ea0743a3f19bab3b43ee1cb855e136bc81c76e2353cd76148440', # polly-11.0.0.src.tar.xz '2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c', # openmp-11.0.0.src.tar.xz 'efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c', # lld-11.0.0.src.tar.xz + '8570c09f57399e21e0eea0dcd66ae0231d47eafc7a04d6fe5c4951b13c4d2c72', # lldb-11.0.0.src.tar.xz '6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a', # libcxx-11.0.0.src.tar.xz '58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15', # libcxxabi-11.0.0.src.tar.xz ] @@ -60,6 +61,7 @@ builddependencies = [ assertions = True usepolly = True build_lld = True +build_lldb = True libcxx = True enable_rtti = True From ee8609c2beb8fbafce903fc4577419b08459f9b1 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Thu, 3 Dec 2020 19:49:46 +0000 Subject: [PATCH 2/4] Clang: add SWIG builddep for lldb --- easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb index 7bfa419ec95f..b25e63ff1e4e 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb @@ -56,6 +56,7 @@ builddependencies = [ ('CMake', '3.16.4'), ('libxml2', '2.9.10'), ('Python', '3.8.2'), + ('SWIG', '4.0.1'), ] assertions = True From 01519725ac0cd32ca9c2cb02e84963fba3721972 Mon Sep 17 00:00:00 2001 From: bartoldeman Date: Thu, 3 Dec 2020 15:25:12 -0500 Subject: [PATCH 3/4] Clang-11.0.0: add comment about SWIG dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mikael Öhman --- easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb index b25e63ff1e4e..64db193d100d 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb @@ -56,7 +56,7 @@ builddependencies = [ ('CMake', '3.16.4'), ('libxml2', '2.9.10'), ('Python', '3.8.2'), - ('SWIG', '4.0.1'), + ('SWIG', '4.0.1'), # Optional dependency for LLDB ] assertions = True From 53600aa7458d39d03ab946b6970d4868d05d2d44 Mon Sep 17 00:00:00 2001 From: bartoldeman Date: Mon, 4 Jan 2021 14:46:49 -0500 Subject: [PATCH 4/4] Update Clang-11.0.0-GCCcore-9.3.0.eb Only keep the optarch change --- easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb index 64db193d100d..ab121752b0a7 100644 --- a/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb +++ b/easybuild/easyconfigs/c/Clang/Clang-11.0.0-GCCcore-9.3.0.eb @@ -28,8 +28,6 @@ sources = [ 'openmp-%(version)s.src.tar.xz', # Also include the LLVM linker 'lld-%(version)s.src.tar.xz', - # Also include the LLVM debugger - 'lldb-%(version)s.src.tar.xz', 'libcxx-%(version)s.src.tar.xz', 'libcxxabi-%(version)s.src.tar.xz', ] @@ -40,7 +38,6 @@ checksums = [ 'dcfadb8d11f2ea0743a3f19bab3b43ee1cb855e136bc81c76e2353cd76148440', # polly-11.0.0.src.tar.xz '2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c', # openmp-11.0.0.src.tar.xz 'efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c', # lld-11.0.0.src.tar.xz - '8570c09f57399e21e0eea0dcd66ae0231d47eafc7a04d6fe5c4951b13c4d2c72', # lldb-11.0.0.src.tar.xz '6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a', # libcxx-11.0.0.src.tar.xz '58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15', # libcxxabi-11.0.0.src.tar.xz ] @@ -56,13 +53,11 @@ builddependencies = [ ('CMake', '3.16.4'), ('libxml2', '2.9.10'), ('Python', '3.8.2'), - ('SWIG', '4.0.1'), # Optional dependency for LLDB ] assertions = True usepolly = True build_lld = True -build_lldb = True libcxx = True enable_rtti = True