Skip to content

ci: Use correct variable to designate C++ compiler #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2024
+10 −10
Merged

ci: Use correct variable to designate C++ compiler #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1810fcb
ci: Use correct variable to designate C++ compiler
hebasto Apr 3, 2024
2d2c695
build: Drop unused `CC` variable
hebasto Apr 3, 2024
e051a7d
ci: Install wine32 package for Windows tests
hebasto Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ task:
<< : *ENV_MATRIX_SAN_VALGRIND
matrix:
- env:
CC: gcc
CXX: g++
- env:
CC: clang
CXX: clang++ -gdwarf-4
<< : *MERGE_BASE
test_script:
- ./ci/cirrus.sh
Expand All @@ -92,9 +92,10 @@ task:
<< : *ENV_MATRIX_VALGRIND
matrix:
- env:
CC: i686-linux-gnu-gcc
CXX: i686-linux-gnu-g++
- env:
CC: clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include
CXX: clang++ --target=i686-linux-gnu -gdwarf-4
CXXFLAGS: -g -O2 -isystem /usr/i686-linux-gnu/include -isystem /usr/i686-linux-gnu/include/c++/10/i686-linux-gnu
test_script:
- ./ci/cirrus.sh
<< : *CAT_LOGS
Expand All @@ -110,9 +111,9 @@ task:
<< : *ENV_MATRIX_SAN
matrix:
- env:
CC: gcc-9
CXX: g++-9
- env:
CC: clang
CXX: clang++
brew_script:
- brew update
- brew install automake libtool gcc@9
Expand Down
2 changes: 1 addition & 1 deletion ci/cirrus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export LC_ALL=C

env >> test_env.log

$CC -v || true
$CXX -v || true
valgrind --version || true

./autogen.sh
Expand Down
4 changes: 2 additions & 2 deletions ci/linux-debian.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ RUN apt-get update
RUN apt-get install --no-install-recommends --no-upgrade -y \
git ca-certificates \
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
gcc g++ clang libc6-dbg \
gcc g++ clang libclang-rt-dev libc6-dbg \
gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \
g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
wine g++-mingw-w64-x86-64
wine wine32:i386 g++-mingw-w64-x86-64

# Run a dummy command in wine to make it set up configuration
RUN wine true || true
1 change: 0 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ if test "x$use_ccache" != "xno"; then
fi
else
use_ccache=yes
CC="$ac_cv_path_CCACHE $CC"
CXX="$ac_cv_path_CCACHE $CXX"
fi
AC_MSG_RESULT($use_ccache)
Expand Down