|
|
|
@ -207,6 +207,7 @@
|
|
|
|
<option>Ubuntu 16</option>
|
|
|
|
<option>Ubuntu 16</option>
|
|
|
|
<option>Ubuntu 18</option>
|
|
|
|
<option>Ubuntu 18</option>
|
|
|
|
<option>Ubuntu 20</option>
|
|
|
|
<option>Ubuntu 20</option>
|
|
|
|
|
|
|
|
<option>Ubuntu 22</option>
|
|
|
|
<option>Other</option>
|
|
|
|
<option>Other</option>
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
<p></p>
|
|
|
|
<p></p>
|
|
|
|
@ -493,6 +494,8 @@ function onOptionsChanged() {
|
|
|
|
return '-6.0';
|
|
|
|
return '-6.0';
|
|
|
|
case 'Ubuntu 20':
|
|
|
|
case 'Ubuntu 20':
|
|
|
|
return '-10';
|
|
|
|
return '-10';
|
|
|
|
|
|
|
|
case 'Ubuntu 22':
|
|
|
|
|
|
|
|
return '-14';
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
return ''; // use default version
|
|
|
|
return ''; // use default version
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -534,6 +537,7 @@ function onOptionsChanged() {
|
|
|
|
case 'Ubuntu 16':
|
|
|
|
case 'Ubuntu 16':
|
|
|
|
case 'Ubuntu 18':
|
|
|
|
case 'Ubuntu 18':
|
|
|
|
case 'Ubuntu 20':
|
|
|
|
case 'Ubuntu 20':
|
|
|
|
|
|
|
|
case 'Ubuntu 22':
|
|
|
|
if (linux_distro.includes('Debian') && !use_root) {
|
|
|
|
if (linux_distro.includes('Debian') && !use_root) {
|
|
|
|
commands.push('su -');
|
|
|
|
commands.push('su -');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -550,7 +554,7 @@ function onOptionsChanged() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (use_clang) {
|
|
|
|
if (use_clang) {
|
|
|
|
packages += ' clang' + getClangVersionSuffix() + ' libc++-dev';
|
|
|
|
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';
|
|
|
|
packages += ' libc++abi-dev';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|