Package/flang: Updated to use own version of llvm (#8766)
Flang now uses its own version of llvm and clang (called flang-driver). This is handled by adding flang-specific versions of the LLVM package and updates flang to depend on those versions.
This commit is contained in:
@@ -100,6 +100,8 @@ class Llvm(CMakePackage):
|
||||
|
||||
base_url = 'http://llvm.org/releases/%%(version)s/%(pkg)s-%%(version)s.src.tar.xz'
|
||||
llvm_url = base_url % {'pkg': 'llvm'}
|
||||
# Flang uses its own fork of llvm.
|
||||
flang_llvm_url = 'https://github.com/flang-compiler/llvm.git'
|
||||
|
||||
resources = {
|
||||
'compiler-rt': {
|
||||
@@ -402,6 +404,47 @@ class Llvm(CMakePackage):
|
||||
},
|
||||
]
|
||||
|
||||
# Flang uses its own fork of clang (renamed flang-driver).
|
||||
flang_resources = {
|
||||
'flang-driver': {
|
||||
'git': 'https://github.com/flang-compiler/flang-driver.git',
|
||||
'destination': 'tools',
|
||||
'placement': 'clang'
|
||||
},
|
||||
'openmp': {
|
||||
'git': 'https://github.com/llvm-mirror/openmp.git',
|
||||
'destination': 'projects',
|
||||
'placement': 'openmp'
|
||||
}
|
||||
}
|
||||
|
||||
flang_releases = [
|
||||
{
|
||||
'version': 'develop',
|
||||
'branch': 'release_60',
|
||||
'resources': {
|
||||
'flang-driver': 'release_60',
|
||||
'openmp': 'release_60',
|
||||
}
|
||||
},
|
||||
{
|
||||
'version': '20180612',
|
||||
'commit': 'f26a3ece4ccd68a52f5aa970ec42837ee0743296',
|
||||
'resources': {
|
||||
'flang-driver': 'e079fa68cb35a53c88c41a1939f90b94d539e984',
|
||||
'openmp': 'd5aa29cb3bcf51289d326b4e565613db8aff65ef'
|
||||
}
|
||||
},
|
||||
{
|
||||
'version': 'ppc64le-20180612',
|
||||
'commit': '4158932a46eb2f06a166f22a4a52ae48c7d2949e',
|
||||
'resources': {
|
||||
'flang-driver': '50c1828a134d5a0f1553b355bf0946db48b0aa6d',
|
||||
'openmp': '29b515e1e6d26b5b0d32d47d28dcdb4b8a11470d'
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
for release in releases:
|
||||
if release['version'] == 'trunk':
|
||||
version(release['version'], svn=release['repo'])
|
||||
@@ -425,6 +468,31 @@ class Llvm(CMakePackage):
|
||||
resources[name].get('variant', "")),
|
||||
placement=resources[name].get('placement', None))
|
||||
|
||||
for release in flang_releases:
|
||||
if release['version'] == 'develop':
|
||||
version('flang-' + release['version'], git=flang_llvm_url, branch=release['branch'])
|
||||
|
||||
for name, branch in release['resources'].items():
|
||||
flang_resource = flang_resources[name]
|
||||
resource(name=name,
|
||||
git=flang_resource['git'],
|
||||
branch=branch,
|
||||
destination=flang_resource['destination'],
|
||||
placement=flang_resource['placement'],
|
||||
when='@flang-' + release['version'])
|
||||
|
||||
else:
|
||||
version('flang-' + release['version'], git=flang_llvm_url, commit=release['commit'])
|
||||
|
||||
for name, commit in release['resources'].items():
|
||||
flang_resource = flang_resources[name]
|
||||
resource(name=name,
|
||||
git=flang_resource['git'],
|
||||
commit=commit,
|
||||
destination=flang_resource['destination'],
|
||||
placement=flang_resource['placement'],
|
||||
when='@flang-' + release['version'])
|
||||
|
||||
conflicts('+clang_extra', when='~clang')
|
||||
conflicts('+lldb', when='~clang')
|
||||
|
||||
|
Reference in New Issue
Block a user