Skip to content

Commit

Permalink
Add Ubuntu 22 to the list of Linux distros.
Browse files Browse the repository at this point in the history
  • Loading branch information
levlam committed Jul 12, 2022
1 parent e44418f commit ef9df9f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build.html
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@
<option>Ubuntu 16</option>
<option>Ubuntu 18</option>
<option>Ubuntu 20</option>
<option>Ubuntu 22</option>
<option>Other</option>
</select>
<p></p>
Expand Down Expand Up @@ -638,7 +639,7 @@
var use_vcpkg = os_windows;

var use_lto = false;
if (!use_msvc && language !== 'Java' && language !== 'Kotlin' && (os_mac || (os_linux && (linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20' || linux_distro === 'Other')))) {
if (!use_msvc && language !== 'Java' && language !== 'Kotlin' && (os_mac || (os_linux && (linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20' || linux_distro === 'Ubuntu 22' || linux_distro === 'Other')))) {
document.getElementById('buildLtoDiv').style.display = 'block';
use_lto = document.getElementById('buildLtoCheckbox').checked;
} else {
Expand Down Expand Up @@ -797,6 +798,8 @@
return '-6.0';
case 'Ubuntu 20':
return '-10';
case 'Ubuntu 22':
return '-14';
default:
return ''; // use default version
}
Expand Down Expand Up @@ -849,6 +852,7 @@
case 'Ubuntu 16':
case 'Ubuntu 18':
case 'Ubuntu 20':
case 'Ubuntu 22':
if (linux_distro.includes('Debian') && !use_root) {
commands.push('su -');
}
Expand All @@ -873,7 +877,7 @@
}
if (use_clang) {
packages += ' clang' + getClangVersionSuffix() + ' libc++-dev';
if (linux_distro === 'Debian 10+' || linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20') {
if (linux_distro === 'Debian 10+' || linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20' || linux_distro === 'Ubuntu 22') {
packages += ' libc++abi-dev';
}
} else {
Expand Down

0 comments on commit ef9df9f

Please sign in to comment.