refactoring
This commit is contained in:
parent
c22ffb6ba1
commit
63c28353f5
1 changed files with 11 additions and 9 deletions
20
action.yml
20
action.yml
|
@ -93,9 +93,6 @@ runs:
|
||||||
$pkgs = 'clang','g++-multilib','llvm'
|
$pkgs = 'clang','g++-multilib','llvm'
|
||||||
}
|
}
|
||||||
Install-Package $pkgs
|
Install-Package $pkgs
|
||||||
|
|
||||||
Link-Exe -Exe clang -LinkName cc
|
|
||||||
Link-Exe -Exe clang++ -LinkName c++
|
|
||||||
} elseif ($cygwin_host) {
|
} elseif ($cygwin_host) {
|
||||||
if (!$x64) {
|
if (!$x64) {
|
||||||
echo @'
|
echo @'
|
||||||
|
@ -111,17 +108,11 @@ runs:
|
||||||
# is required; it's simpler to install gcc-g++ for all the
|
# is required; it's simpler to install gcc-g++ for all the
|
||||||
# dependencies.
|
# dependencies.
|
||||||
Install-Package clang gcc-g++ libiconv-devel llvm
|
Install-Package clang gcc-g++ libiconv-devel llvm
|
||||||
|
|
||||||
Link-Exe -Exe clang -LinkName cc
|
|
||||||
Link-Exe -Exe clang++ -LinkName c++
|
|
||||||
} elseif ($windows_host) {
|
} elseif ($windows_host) {
|
||||||
Install-Package llvm
|
Install-Package llvm
|
||||||
|
|
||||||
$bin_dir = Join-Path $env:ProgramFiles LLVM bin
|
$bin_dir = Join-Path $env:ProgramFiles LLVM bin
|
||||||
echo $bin_dir >> $env:GITHUB_PATH
|
echo $bin_dir >> $env:GITHUB_PATH
|
||||||
|
|
||||||
Link-Exe -Exe (Join-Path $bin_dir clang) -LinkName cc
|
|
||||||
Link-Exe -Exe (Join-Path $bin_dir clang++) -LinkName c++
|
|
||||||
} else {
|
} else {
|
||||||
throw "Sorry, installing Clang is unsupported on $os"
|
throw "Sorry, installing Clang is unsupported on $os"
|
||||||
}
|
}
|
||||||
|
@ -144,6 +135,17 @@ runs:
|
||||||
done < <( find /usr/bin -type l -a '-(' -iname 'clang*' -o -iname 'llvm*' '-)' -print0 )
|
done < <( find /usr/bin -type l -a '-(' -iname 'clang*' -o -iname 'llvm*' '-)' -print0 )
|
||||||
'@ | & bash.exe --login -o errexit -o nounset -o pipefail -o igncr
|
'@ | & bash.exe --login -o errexit -o nounset -o pipefail -o igncr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($linux_host) {
|
||||||
|
Link-Exe -Exe clang -LinkName cc
|
||||||
|
Link-Exe -Exe clang++ -LinkName c++
|
||||||
|
} elseif ($cygwin_host) {
|
||||||
|
Link-Exe -Exe clang -LinkName cc
|
||||||
|
Link-Exe -Exe clang++ -LinkName c++
|
||||||
|
} elseif ($windows_host) {
|
||||||
|
Link-Exe -Exe (Join-Path $bin_dir clang) -LinkName cc
|
||||||
|
Link-Exe -Exe (Join-Path $bin_dir clang++) -LinkName c++
|
||||||
|
}
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
||||||
branding:
|
branding:
|
||||||
|
|
Loading…
Add table
Reference in a new issue