zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLVM: Revert build_llvm_dylib to llvm_dylib (#27761)

Browse Source
This commit is contained in:
kwryankrattiger 2021-12-03 16:47:05 -06:00 committed by GitHub
parent 6f9dc1c926
commit 203ccdd976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml
View File

@ -119,7 +119,7 @@ spack:
- libnrm - libnrm
- libquo - libquo
- libunwind - libunwind
- llvm +all_targets +clang +compiler-rt +libcxx +lld +lldb +build_llvm_dylib +flang ~cuda - llvm +all_targets +clang +compiler-rt +libcxx +lld +lldb +llvm_dylib +flang ~cuda
- loki - loki
- mercury - mercury
- metall - metall

2
share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
View File

@ -130,7 +130,7 @@ spack:
- libnrm - libnrm
- libquo - libquo
- libunwind - libunwind
- llvm +all_targets +clang +compiler-rt +libcxx +lld +lldb +build_llvm_dylib +flang ~cuda - llvm +all_targets +clang +compiler-rt +libcxx +lld +lldb +llvm_dylib +flang ~cuda
- loki - loki
- mercury - mercury
- metall - metall

8
var/spack/repos/builtin/packages/llvm/package.py
View File

@ -127,7 +127,7 @@ class Llvm(CMakePackage, CudaPackage):
"less memory to build, less stable", "less memory to build, less stable",
) )
variant( variant(
"build_llvm_dylib", "llvm_dylib",
default=False, default=False,
description="Build LLVM shared library, containing all " description="Build LLVM shared library, containing all "
"components in a single shared library", "components in a single shared library",
@ -202,8 +202,8 @@ class Llvm(CMakePackage, CudaPackage):
depends_on("gmp", when="@:3.6 +polly") depends_on("gmp", when="@:3.6 +polly")
depends_on("isl", when="@:3.6 +polly") depends_on("isl", when="@:3.6 +polly")
conflicts("+build_llvm_dylib", when="+shared_libs") conflicts("+llvm_dylib", when="+shared_libs")
conflicts("+link_llvm_dylib", when="~build_llvm_dylib") conflicts("+link_llvm_dylib", when="~llvm_dylib")
conflicts("+lldb", when="~clang") conflicts("+lldb", when="~clang")
conflicts("+libcxx", when="~clang") conflicts("+libcxx", when="~clang")
conflicts("+internal_unwind", when="~clang") conflicts("+internal_unwind", when="~clang")
@ -609,7 +609,7 @@ def cmake_args(self):
cmake_args.extend([ cmake_args.extend([
from_variant("BUILD_SHARED_LIBS", "shared_libs"), from_variant("BUILD_SHARED_LIBS", "shared_libs"),
from_variant("LLVM_BUILD_LLVM_DYLIB", "build_llvm_dylib"), from_variant("LLVM_BUILD_LLVM_DYLIB", "llvm_dylib"),
from_variant("LLVM_LINK_LLVM_DYLIB", "link_llvm_dylib"), from_variant("LLVM_LINK_LLVM_DYLIB", "link_llvm_dylib"),
from_variant("LLVM_USE_SPLIT_DWARF", "split_dwarf"), from_variant("LLVM_USE_SPLIT_DWARF", "split_dwarf"),
# By default on Linux, libc++.so is a ldscript. CMake fails to add # By default on Linux, libc++.so is a ldscript. CMake fails to add