Avoid indirection

This commit is contained in:
Sam McCall 2020-05-07 12:42:30 +02:00
parent 68f6aa750f
commit 42e2573b58

View File

@ -72,9 +72,6 @@ jobs:
"-DCMAKE_EXE_LINKER_FLAGS_RELEASE=-static-libgcc -Wl,--compress-debug-sections=zlib" "-DCMAKE_EXE_LINKER_FLAGS_RELEASE=-static-libgcc -Wl,--compress-debug-sections=zlib"
"-DLLVM_STATIC_LINK_CXX_STDLIB=ON" "-DLLVM_STATIC_LINK_CXX_STDLIB=ON"
"-DLLVM_ENABLE_ZLIB=FORCE_ON" "-DLLVM_ENABLE_ZLIB=FORCE_ON"
post_cmake: |
# Link zlib statically. LLVM 10 has no option for this!
sed -i 's/ -lz / -l:libz.a /' "$CLANGD_DIR/build.ninja"
steps: steps:
- name: Clone scripts - name: Clone scripts
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -121,8 +118,10 @@ jobs:
"-DCLANG_PLUGIN_SUPPORT=OFF" "-DCLANG_PLUGIN_SUPPORT=OFF"
"-DLLVM_ENABLE_PLUGINS=OFF" "-DLLVM_ENABLE_PLUGINS=OFF"
${{ matrix.config.cmake }} ${{ matrix.config.cmake }}
# LLVM 10 has no way to statically link zlib via CMake itself, AFAICT...
${{ matrix.config.post_cmake }} - name: Statically link zlib
if: matrix.config.name == 'linux'
run: sed -i 's/ -lz / -l:libz.a /' "$CLANGD_DIR/build.ninja"
- name: Ninja - name: Ninja
run: ninja -C ${{ env.CLANGD_DIR }} clangd run: ninja -C ${{ env.CLANGD_DIR }} clangd
- name: Archive - name: Archive