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

Fix toolchain

Browse Source
This commit is contained in:
Andrea Cavalli 2023-05-07 16:39:12 +02:00
parent 5c0d4a0242
commit ed2b68ec45
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/platform_natives.yaml vendored
View File

@ -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 libc++-dev libc++abi-dev ccache packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-dev libc++abi-dev ccache
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 libc++-dev libc++abi-dev ccache packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-dev libc++abi-dev ccache
version: 1.0 version: 1.0
- name: Install MSVC - name: Install MSVC
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-2019'

5
.github/workflows/toolchains/toolchain-cmake-host-ubuntu2004.cmake vendored
View File

@ -2,7 +2,7 @@ SET(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_C_COMPILER clang-10) set(CMAKE_C_COMPILER clang-10)
set(CMAKE_CXX_COMPILER clang++-10) set(CMAKE_CXX_COMPILER clang++-10)
set(CMAKE_AR llvm-ar) set(CMAKE_AR llvm-ar-10)
# Set various compiler flags # Set various compiler flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections")
@ -10,5 +10,4 @@ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -stdlib=libc++ -fno-exc
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi")
# Use LLD on linux # Use LLD on linux
#add_link_options("-fuse-ld=lld" "-rtlib=compiler-rt" "-unwindlib=libunwind" "-Wl,--as-needed") add_link_options("-fuse-ld=lld")
add_link_options("-fuse-ld=lld" "-v")

4
.github/workflows/toolchains/toolchain-cmake-host-ubuntu2204.cmake vendored
View File

@ -2,7 +2,7 @@ SET(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_C_COMPILER clang-14) set(CMAKE_C_COMPILER clang-14)
set(CMAKE_CXX_COMPILER clang++-14) set(CMAKE_CXX_COMPILER clang++-14)
set(CMAKE_AR llvm-ar) set(CMAKE_AR llvm-ar-14)
# Set various compiler flags # Set various compiler flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections")
@ -11,4 +11,4 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++
# Use LLD on linux # Use LLD on linux
#add_link_options("-fuse-ld=lld" "-rtlib=compiler-rt" "-unwindlib=libunwind" "-Wl,--as-needed") #add_link_options("-fuse-ld=lld" "-rtlib=compiler-rt" "-unwindlib=libunwind" "-Wl,--as-needed")
add_link_options("-fuse-ld=lld" "-v") add_link_options("-fuse-ld=lld")