@@ -950,15 +950,6 @@ jobs:
950950 steps :
951951 - uses : actions/checkout@v2
952952
953- - name : Cache libc++
954- id : cache-libcxx
955- if : matrix.config.libcxx
956- uses : actions/cache@v2
957- with :
958- path : |
959- ./llvm
960- key : ${{matrix.config.os}}-libcxx-${{matrix.config.compiler}}
961-
962953 - name : Setup Cpp
963954 uses : aminya/setup-cpp@v1
964955 with :
@@ -967,15 +958,6 @@ jobs:
967958 ninja : true
968959 kcov : ${{ startsWith(matrix.config.os, 'ubuntu') }}
969960
970- - name : Install libc++
971- id : install_libcxx
972- if : matrix.config.libcxx && (steps.cache-libcxx.outputs.cache-hit != 'true')
973- shell : bash
974- working-directory : ${{ env.HOME }}
975- run : |
976- sudo ln -s /usr/include/locale.h /usr/include/xlocale.h
977- $GITHUB_WORKSPACE/install_libcxx.sh
978-
979961 - name : Verify compilation errors
980962 if : (!startsWith(matrix.config.os, 'windows'))
981963 shell : bash
@@ -1000,8 +982,8 @@ jobs:
1000982 run : |
1001983 if [ "x${{ matrix.config.libcxx }}" == "xtrue" ]
1002984 then
1003- cxx_flags="${cxx_flags} -stdlib=libc++ -nostdinc++ -cxx-isystem ${GITHUB_WORKSPACE}/llvm /include/c++/v1/ -Wno-unused-command-line-argument"
1004- link_flags="${link_flags} -L ${GITHUB_WORKSPACE}/llvm/lib -Wl,-rpath,${GITHUB_WORKSPACE}/llvm /lib -lc++abi"
985+ cxx_flags="${cxx_flags} ${CPPFLAGS} -stdlib=libc++ -nostdinc++ -cxx-isystem ${LLVM_PATH} /include/c++/v1/ -Wno-unused-command-line-argument"
986+ link_flags="${link_flags} ${LDFLAGS} -Wl,-rpath,${LLVM_PATH} /lib -lc++abi"
1005987 fi
1006988
1007989 if [ "x${{ matrix.config.cxx_asan }}" == "xtrue" ]
0 commit comments