fix
This commit is contained in:
parent
7e48ad503d
commit
baf9d2d778
@ -125,13 +125,13 @@ jobs:
|
|||||||
if: matrix.os == 'ubuntu-20.04'
|
if: matrix.os == 'ubuntu-20.04'
|
||||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||||
with:
|
with:
|
||||||
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-10-dev libc++abi-10-dev libstdc++-10-dev libstdc++-10-dev libstdc++-10-dev-arm64-cross ccache maven
|
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-10-dev libc++abi-10-dev ccache maven
|
||||||
version: 1.0
|
version: 1.0
|
||||||
- name: Install ubuntu 22.04 dependencies
|
- name: Install ubuntu 22.04 dependencies
|
||||||
if: matrix.os == 'ubuntu-22.04'
|
if: matrix.os == 'ubuntu-22.04'
|
||||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||||
with:
|
with:
|
||||||
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-14-dev libc++abi-14-dev libstdc++-14-dev libstdc++-14-dev-arm64-cross ccache maven
|
packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-14-dev libc++abi-14-dev ccache maven
|
||||||
version: 1.0
|
version: 1.0
|
||||||
- name: Install MSVC
|
- name: Install MSVC
|
||||||
if: matrix.os == 'windows-2019'
|
if: matrix.os == 'windows-2019'
|
||||||
|
2
.github/workflows/tdapi_file.yaml.disabled
vendored
2
.github/workflows/tdapi_file.yaml.disabled
vendored
@ -18,7 +18,7 @@ jobs:
|
|||||||
if: matrix.os == 'ubuntu-22.04'
|
if: matrix.os == 'ubuntu-22.04'
|
||||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||||
with:
|
with:
|
||||||
packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 libc++-14-dev libc++abi-14-dev libstdc++-14-dev maven
|
packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 libc++-14-dev libc++abi-14-dev ccache maven
|
||||||
version: 1.0
|
version: 1.0
|
||||||
- name: Install SSH key
|
- name: Install SSH key
|
||||||
uses: shimataro/ssh-key-action@v2
|
uses: shimataro/ssh-key-action@v2
|
||||||
|
@ -11,8 +11,10 @@ set(CMAKE_CXX_COMPILER_TARGET ${triple})
|
|||||||
set(CMAKE_AR /usr/bin/llvm-ar-10)
|
set(CMAKE_AR /usr/bin/llvm-ar-10)
|
||||||
|
|
||||||
# Set various compiler flags
|
# Set various compiler flags
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=lld")
|
set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld -stdlib=libc++")
|
set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||||
|
|
||||||
|
|
||||||
# Use our definitions for compiler tools
|
# Use our definitions for compiler tools
|
||||||
|
Loading…
Reference in New Issue
Block a user