diff options
| author | levlam <levlam@telegram.org> | 2019-11-18 13:31:50 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2019-11-18 13:31:50 +0300 |
| commit | 818279238c9fd3daa839f8232e6948c93da7fe51 (patch) | |
| tree | 259b83da41ad430a0e1bcdd10404e6d2b62cb566 /build.html | |
| parent | fe6a635ebffa7081b068cd55597e3501946b89d1 (diff) | |
Fix build instructions for Ubuntu 18.
GitOrigin-RevId: 75c4740b277cf1e2cd53054e41cae6e1944695b9
Diffstat (limited to 'build.html')
| -rw-r--r-- | build.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build.html b/build.html index f0d47d31a..d487597d2 100644 --- a/build.html +++ b/build.html @@ -411,7 +411,7 @@ function onOptionsChanged() { var use_vcpkg = os_windows; 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'; use_lto = document.getElementById('buildLtoCheckbox').checked; } else { @@ -609,7 +609,7 @@ function onOptionsChanged() { } if (use_clang) { if (linux_distro === 'Ubuntu 18') { - packages += ' clang-6.0 libc++abi-dev'; + packages += ' clang-6.0 libc++-dev libc++abi-dev'; } else { if (linux_distro === 'Ubuntu 14') { packages += ' clang-3.9'; @@ -781,12 +781,14 @@ function onOptionsChanged() { var prefix = ''; if (os_linux) { if (use_clang) { - prefix = 'CC=/usr/bin/clang CXX=/usr/bin/clang++ '; 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_NM=/usr/bin/llvm-nm-6.0'); options.push('-DCMAKE_OBJDUMP=/usr/bin/llvm-objdump-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') { prefix = 'CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 '; |