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

Fix build instructions for Ubuntu 18.

Browse Source 
GitOrigin-RevId: 75c4740b277cf1e2cd53054e41cae6e1944695b9
This commit is contained in:
levlam 2019-11-18 13:31:50 +03:00
parent fe6a635ebf
commit 818279238c
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

@ -411,7 +411,7 @@ function onOptionsChanged() {
var use_vcpkg = os_windows; var use_vcpkg = os_windows;
var use_lto = false; var use_lto = false;
if (!use_msvc && language !== 'Java' && (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 === 'Other')))) {
document.getElementById('buildLtoDiv').style.display = 'block'; document.getElementById('buildLtoDiv').style.display = 'block';
use_lto = document.getElementById('buildLtoCheckbox').checked; use_lto = document.getElementById('buildLtoCheckbox').checked;
} else { } else {
@ -609,7 +609,7 @@ function onOptionsChanged() {
} }
if (use_clang) { if (use_clang) {
if (linux_distro === 'Ubuntu 18') { if (linux_distro === 'Ubuntu 18') {
packages += ' clang-6.0 libc++abi-dev'; packages += ' clang-6.0 libc++-dev libc++abi-dev';
} else { } else {
if (linux_distro === 'Ubuntu 14') { if (linux_distro === 'Ubuntu 14') {
packages += ' clang-3.9'; packages += ' clang-3.9';
@ -781,12 +781,14 @@ function onOptionsChanged() {
var prefix = ''; var prefix = '';
if (os_linux) { if (os_linux) {
if (use_clang) { if (use_clang) {
prefix = 'CC=/usr/bin/clang CXX=/usr/bin/clang++ ';
if (linux_distro === 'Ubuntu 18') { if (linux_distro === 'Ubuntu 18') {
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_AR=/usr/bin/llvm-ar-6.0');
options.push('-DCMAKE_NM=/usr/bin/llvm-nm-6.0'); options.push('-DCMAKE_NM=/usr/bin/llvm-nm-6.0');
options.push('-DCMAKE_OBJDUMP=/usr/bin/llvm-objdump-6.0'); options.push('-DCMAKE_OBJDUMP=/usr/bin/llvm-objdump-6.0');
options.push('-DCMAKE_RANLIB=/usr/bin/llvm-ranlib-6.0'); options.push('-DCMAKE_RANLIB=/usr/bin/llvm-ranlib-6.0');
} else {
prefix = 'CC=/usr/bin/clang CXX=/usr/bin/clang++ ';
} }
} else if (linux_distro === 'Ubuntu 14') { } else if (linux_distro === 'Ubuntu 14') {
prefix = 'CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 '; prefix = 'CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 ';