remove hack
This commit is contained in:
parent
7eeaf563e4
commit
ef434b41eb
1 changed files with 0 additions and 11 deletions
11
action.yml
11
action.yml
|
@ -124,7 +124,6 @@ runs:
|
||||||
$pkg_clang = 'clang'
|
$pkg_clang = 'clang'
|
||||||
$pkg_llvm = 'llvm'
|
$pkg_llvm = 'llvm'
|
||||||
$pkg_gxx = 'g++'
|
$pkg_gxx = 'g++'
|
||||||
$additional_deps = @()
|
|
||||||
|
|
||||||
if (!$latest) {
|
if (!$latest) {
|
||||||
$pkg_version = Format-UpstreamVersion $version
|
$pkg_version = Format-UpstreamVersion $version
|
||||||
|
@ -135,21 +134,11 @@ runs:
|
||||||
|
|
||||||
$clang = "$clang-$pkg_version"
|
$clang = "$clang-$pkg_version"
|
||||||
$clangxx = "$clangxx-$pkg_version"
|
$clangxx = "$clangxx-$pkg_version"
|
||||||
|
|
||||||
if ($pkg_version -eq '13') {
|
|
||||||
# On both Bionic and Focal, the following error occurs otherwise:
|
|
||||||
#
|
|
||||||
# The following packages have unmet dependencies:
|
|
||||||
# llvm-13 : Depends: libomp5-13 (>= 8) but it is not going to be installed
|
|
||||||
# E: Unable to correct problems, you have held broken packages.
|
|
||||||
$additional_deps += 'libomp5-13'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!$x64) {
|
if (!$x64) {
|
||||||
$pkg_gxx = 'g++-multilib'
|
$pkg_gxx = 'g++-multilib'
|
||||||
}
|
}
|
||||||
$packages = $pkg_clang,$pkg_llvm,$pkg_gxx
|
$packages = $pkg_clang,$pkg_llvm,$pkg_gxx
|
||||||
$packages += $additional_deps
|
|
||||||
|
|
||||||
Install-Package $packages
|
Install-Package $packages
|
||||||
} elseif ($cygwin_host) {
|
} elseif ($cygwin_host) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue