Mercurial > octave
changeset 31986:baf8322763c0
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 08 Apr 2023 14:03:43 +0200 |
parents | ff1fed5bf218 (current diff) 2f21784af0b9 (diff) |
children | 50b3024162cd |
files | .github/workflows/make.yaml |
diffstat | 1 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/make.yaml Sat Apr 08 09:48:50 2023 +0200 +++ b/.github/workflows/make.yaml Sat Apr 08 14:03:43 2023 +0200 @@ -21,10 +21,12 @@ compiler-pkgs: "g++ gcc" cc: "gcc" cxx: "g++" + extra-config-flags: "" - compiler: clang - compiler-pkgs: "clang" + compiler-pkgs: "clang libc++-dev libc++abi-dev" cc: "clang" - cxx: "clang++" + cxx: "clang++ -stdlib=libc++" + extra-config-flags: "--without-spqr --without-magick" # "ccache" on Ubuntu 20.04 doesn't compress the cache. # Clang seems to generally require less cache size (smaller object files?). - ccache-max: 1.2G @@ -41,6 +43,8 @@ compiler: clang ccache-max: 400M + name: ${{ matrix.os }} ${{ matrix.compiler }} + env: CC: ${{ matrix.cc }} CXX: ${{ matrix.cxx }} @@ -105,16 +109,17 @@ which $CC echo $CC --version $CC --version - which $CXX - echo $CXX --version - $CXX --version + which ${CXX% *} + echo ${CXX% *} --version + ${CXX% *} --version which gfortran echo gfortran --version gfortran --version mkdir .build cd .build && ../configure \ CPPFLAGS="-I/usr/include/hdf5/serial -I/usr/include/suitesparse" \ - LDFLAGS="-L/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/hdf5/serial" + LDFLAGS="-L/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/hdf5/serial" \ + ${{ matrix.extra-config-flags }} - name: build # Parallel make seems to fail intermittently when creating the figures