mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-02-23 08:46:55 +00:00
Use clang to build jemalloc since it crashes with gcc
This commit is contained in:
parent
8d4174afb5
commit
ee8c6f68d7
@ -868,6 +868,8 @@ COPY --from=breakpad ${LibrariesPath}/breakpad breakpad
|
||||
COPY --from=breakpad ${LibrariesPath}/breakpad-cache /
|
||||
COPY --from=webrtc ${LibrariesPath}/tg_owt tg_owt
|
||||
|
||||
RUN yum -y install llvm-toolset-7.0 llvm-toolset-7.0-clang-devel llvm-toolset-7.0-llvm-devel
|
||||
|
||||
WORKDIR ../tdesktop
|
||||
VOLUME [ "/usr/src/tdesktop" ]
|
||||
CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]
|
||||
|
@ -1,10 +1,10 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- bash
|
||||
|
||||
cd Telegram
|
||||
scl enable devtoolset-9 -- ./configure.sh "$@"
|
||||
./configure.sh "$@"
|
||||
|
||||
if [ -n "$DEBUG" ]; then
|
||||
scl enable devtoolset-9 -- cmake3 --build ../out/Debug -j$(nproc)
|
||||
cmake3 --build ../out/Debug -j$(nproc)
|
||||
else
|
||||
scl enable devtoolset-9 -- cmake3 --build ../out/Release -j$(nproc)
|
||||
cmake3 --build ../out/Release -j$(nproc)
|
||||
fi
|
||||
|
@ -85,6 +85,7 @@ parts:
|
||||
build-environment:
|
||||
- LD_LIBRARY_PATH: $SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$LD_LIBRARY_PATH
|
||||
build-packages:
|
||||
- clang
|
||||
- python
|
||||
- libasound2-dev
|
||||
- libglib2.0-dev
|
||||
|
Loading…
Reference in New Issue
Block a user