diff options
| author | Björn Esser <besser82@fedoraproject.org> | 2020-02-07 12:59:09 +0100 |
|---|---|---|
| committer | Björn Esser <besser82@fedoraproject.org> | 2020-02-07 15:31:14 +0100 |
| commit | 3a694ec602ade241de948772adb598e19ef8cc35 (patch) | |
| tree | 96d76c45606e3a717bec605b4cace51b15c2b269 | |
| parent | 2159f0b41787c28d0f71ce384530007a03d51559 (diff) | |
| download | libxcrypt-3a694ec602ade241de948772adb598e19ef8cc35.tar.gz libxcrypt-3a694ec602ade241de948772adb598e19ef8cc35.tar.bz2 libxcrypt-3a694ec602ade241de948772adb598e19ef8cc35.zip | |
TravisCI: Add test build for homebrew GCC on OSX.
The previous commit fixes building and testing libxcrypt
on MacOSX. Thus we should do a test build with the default
version of the homebrew GCC as well.
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | .travis_script.sh | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 14443a7..1e246db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ addons: packages: - autoconf - automake + - gcc + - jq - libtool - pkg-config @@ -90,6 +92,11 @@ matrix: os: linux env: - CONF="--disable-shared --enable-hashes=all" + - name: "macOS, GCC (Homebrew), all hashes, obsolete API" + compiler: gcc + os: osx + env: + - CONF="--enable-obsolete-api --enable-hashes=all" - name: "macOS, Clang, all hashes, obsolete API" compiler: clang os: osx diff --git a/.travis_script.sh b/.travis_script.sh index 23911b8..8b1ee5f 100755 --- a/.travis_script.sh +++ b/.travis_script.sh @@ -97,6 +97,16 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-O2 -g -arch i386 -arch x86_64 --coverage" export CXXFLAGS="$CFLAGS" export LDFLAGS="-arch i386 -arch x86_64" + if [[ "$CC" == "gcc" ]]; then + GCC_VER="$(curl -s https://formulae.brew.sh/api/formula/gcc.json | jq -r '.versions.stable' | cut -d. -f1)" + export CC="gcc-$GCC_VER" + export CPP="cpp-$GCC_VER" + export CXX="g++-$GCC_VER" + export AR="gcc-ar-$GCC_VER" + export NM="gcc-nm-$GCC_VER" + export RANLIB="gcc-ranlib-$GCC_VER" + $CC --version + fi elif [[ "$CODECOV" == "1" ]]; then export CFLAGS="-O0 -g --coverage" export CXXFLAGS="$CFLAGS" |