diff --git a/.github/workflows/platform_natives.yaml.disabled b/.github/workflows/platform_natives.yaml.disabled index a9e3b70..627a7a6 100644 --- a/.github/workflows/platform_natives.yaml.disabled +++ b/.github/workflows/platform_natives.yaml.disabled @@ -125,13 +125,13 @@ jobs: if: matrix.os == 'ubuntu-20.04' uses: awalsh128/cache-apt-pkgs-action@latest 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 - name: Install ubuntu 22.04 dependencies if: matrix.os == 'ubuntu-22.04' uses: awalsh128/cache-apt-pkgs-action@latest 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 - name: Install MSVC if: matrix.os == 'windows-2019' diff --git a/.github/workflows/tdapi_file.yaml.disabled b/.github/workflows/tdapi_file.yaml.disabled index 977c53e..5607d97 100644 --- a/.github/workflows/tdapi_file.yaml.disabled +++ b/.github/workflows/tdapi_file.yaml.disabled @@ -18,7 +18,7 @@ jobs: if: matrix.os == 'ubuntu-22.04' uses: awalsh128/cache-apt-pkgs-action@latest 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 - name: Install SSH key uses: shimataro/ssh-key-action@v2 diff --git a/.github/workflows/toolchains/toolchain-arm64.cmake b/.github/workflows/toolchains/toolchain-arm64.cmake index 439c462..38dd169 100644 --- a/.github/workflows/toolchains/toolchain-arm64.cmake +++ b/.github/workflows/toolchains/toolchain-arm64.cmake @@ -11,8 +11,10 @@ set(CMAKE_CXX_COMPILER_TARGET ${triple}) set(CMAKE_AR /usr/bin/llvm-ar-10) # Set various compiler flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=lld") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld -stdlib=libc++") +set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld") +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