tdlight-team/tdlight
tdlight-team
/
tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Ubuntu 20 to build instructions generator. 

GitOrigin-RevId: 359b924315811b678565a0ab43888659c4acc400
This commit is contained in:
levlam 2020-07-26 21:04:41 +03:00
parent 2b685a2396
commit 9f18424e22
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.html
View File

@ -63,6 +63,7 @@ select.large { font-size: large; }
<option>Ubuntu 14</option>
<option>Ubuntu 16</option>
<option>Ubuntu 18</option>
<option>Ubuntu 20</option>
<option>Other</option>
</select>
<p></p>
@ -411,7 +412,7 @@ function onOptionsChanged() {
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 === 'Other')))) {
if (!use_msvc && language !== 'Java' && language !== 'Kotlin' && (os_mac || (os_linux && (linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20' || linux_distro === 'Other')))) {
document.getElementById('buildLtoDiv').style.display = 'block';
use_lto = document.getElementById('buildLtoCheckbox').checked;
} else {
@ -586,6 +587,7 @@ function onOptionsChanged() {
case 'Ubuntu 14':
case 'Ubuntu 16':
case 'Ubuntu 18':
case 'Ubuntu 20':
if (linux_distro.includes('Debian') && !use_root) {
commands.push('su -');
}
@ -609,7 +611,7 @@ function onOptionsChanged() {
packages += ' default-jdk';
}
if (use_clang) {
if (linux_distro === 'Ubuntu 18') {
if (linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20') {
packages += ' clang-6.0 libc++-dev libc++abi-dev';
} else {
if (linux_distro === 'Ubuntu 14') {
@ -783,7 +785,7 @@ function onOptionsChanged() {
var prefix = '';
if (os_linux) {
if (use_clang) {
if (linux_distro === 'Ubuntu 18') {
if (linux_distro === 'Ubuntu 18' || linux_distro === 'Ubuntu 20') {
prefix = 'CC=/usr/bin/clang-6.0 CXX=/usr/bin/clang++-6.0 ';
options.push('-DCMAKE_AR=/usr/bin/llvm-ar-6.0');
options.push('-DCMAKE_NM=/usr/bin/llvm-nm-6.0');