From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 5/5] travis-ci: build with the right compiler
Date: Thu, 17 Jan 2019 14:44:59 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1901171439280.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190117012913.30562-6-szeder.dev@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4488 bytes --]
Hi Gábor,
On Thu, 17 Jan 2019, SZEDER Gábor wrote:
> Our 'Makefile' hardcodes the compiler to build Git as 'CC = cc'. This
> CC variable can be overridden from the command line, i.e. 'make
> CC=gcc-X.Y' will build with that particular GCC version, but not from
> the environment, i.e. 'CC=gcc-X.Y make' will still build with whatever
> 'cc' happens to be on the platform.
>
> Our build jobs on Travis CI are badly affected by this. In the build
> matrix we have dedicated build jobs to build Git with GCC and Clang
> both on Linux and macOS from the very beginning (522354d70f (Add
> Travis CI support, 2015-11-27)). Alas, this never really worked as
> supposed to, because Travis CI specifies the compiler for those build
> jobs as 'export CC=gcc' and 'export CC=clang' (which works fine for
> projects built with './configure && make'). Consequently, our
> 'linux-clang' build job has always used GCC, because that's where 'cc'
> points at in Travis CI's Linux images, while the 'osx-gcc' build job
> has always used Clang. Furthermore, 37fa4b3c78 (travis-ci: run gcc-8
> on linux-gcc jobs, 2018-05-19) added an 'export CC=gcc-8' in an
> attempt to build with a more modern compiler, but to no avail.
>
> Set MAKEFLAGS with CC based on the $CC environment variable, so 'make'
> will run the "right" compiler. The Xcode 10.1 macOS image on Travis
> CI already contains the gcc@8 package from Homebrew, but we have to
> 'brew link' it first to be able to use it.
>
> So with this patch our build jobs will build Git with the following
> compiler versions:
>
> linux-clang: clang version 5.0.0 (tags/RELEASE_500/final)
> linux-gcc: gcc-8 (Ubuntu 8.1.0-5ubuntu1~14.04) 8.1.0
>
> osx-clang: Apple LLVM version 10.0.0 (clang-1000.11.45.5)
> osx-gcc: gcc-8 (Homebrew GCC 8.2.0) 8.2.0
>
> GETTEXT_POISON: gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Nicely explained and implemented. Thank you!
Apart from the single typo I stumbled over (quite honestly, I do not
really care about typos, I just point them out when I see them to beat
Eric to it), I have just one more wish: I would *love* to see a Travis
run.
Surely you opened a PR at https://github.com/git/git. Oh wait, I can look
for it! But no, there does not seem to be one. So probably in your fork,
https://github.com/szeder/git. No PRs. Ah, but there are branches! 60 of
them. And yes, I guess I found a Travis build:
https://travis-ci.org/szeder/git/builds/480654256
But no, the associated branch does not look like it reflects this patch
series...
In any case, this series is:
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ciao,
Dscho
> ---
> ci/install-dependencies.sh | 5 +++++
> ci/lib-travisci.sh | 15 ++++++++++++---
> 2 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
> index 06c3546e1e..dc719876bb 100755
> --- a/ci/install-dependencies.sh
> +++ b/ci/install-dependencies.sh
> @@ -40,6 +40,11 @@ osx-clang|osx-gcc)
> brew install git-lfs gettext
> brew link --force gettext
> brew install caskroom/cask/perforce
> + case "$jobname" in
> + osx-gcc)
> + brew link gcc@8
> + ;;
> + esac
> ;;
> StaticAnalysis)
> sudo apt-get -q update
> diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
> index 69dff4d1ec..a479613a57 100755
> --- a/ci/lib-travisci.sh
> +++ b/ci/lib-travisci.sh
> @@ -99,12 +99,14 @@ export DEFAULT_TEST_TARGET=prove
> export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
> export GIT_TEST_OPTS="--verbose-log -x --immediate"
> export GIT_TEST_CLONE_2GB=YesPlease
> -if [ "$jobname" = linux-gcc ]; then
> - export CC=gcc-8
> -fi
>
> case "$jobname" in
> linux-clang|linux-gcc)
> + if [ "$jobname" = linux-gcc ]
> + then
> + export CC=gcc-8
> + fi
> +
> export GIT_TEST_HTTPD=YesPlease
>
> # The Linux build installs the defined dependency versions below.
> @@ -118,6 +120,11 @@ linux-clang|linux-gcc)
> export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
> ;;
> osx-clang|osx-gcc)
> + if [ "$jobname" = osx-gcc ]
> + then
> + export CC=gcc-8
> + fi
> +
> # t9810 occasionally fails on Travis CI OS X
> # t9816 occasionally fails with "TAP out of sequence errors" on
> # Travis CI OS X
> @@ -127,3 +134,5 @@ GIT_TEST_GETTEXT_POISON)
> export GIT_TEST_GETTEXT_POISON=YesPlease
> ;;
> esac
> +
> +export MAKEFLAGS="CC=${CC:-cc}"
> --
> 2.20.1.499.gf60de1223c
>
>
next prev parent reply other threads:[~2019-01-17 13:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 18:45 On overriding make variables from the environment SZEDER Gábor
2018-10-16 21:54 ` Jonathan Nieder
2018-10-16 22:33 ` SZEDER Gábor
2018-10-16 22:40 ` Jonathan Nieder
2018-10-17 14:29 ` SZEDER Gábor
2018-10-18 10:01 ` Johannes Schindelin
2018-10-18 12:49 ` Junio C Hamano
2018-12-20 16:24 ` [PATCH 0/5] travis-ci: build with the right compiler SZEDER Gábor
2018-12-20 16:24 ` [PATCH 1/5] compat/obstack: fix -Wcast-function-type warnings SZEDER Gábor
2018-12-20 23:12 ` Ævar Arnfjörð Bjarmason
2019-01-10 21:22 ` Junio C Hamano
2019-01-11 0:37 ` SZEDER Gábor
2019-01-11 18:03 ` Junio C Hamano
2019-01-11 18:51 ` SZEDER Gábor
2019-01-15 23:55 ` SZEDER Gábor
2019-01-16 1:13 ` Jonathan Nieder
2019-01-17 1:36 ` SZEDER Gábor
2019-01-16 4:16 ` Junio C Hamano
2018-12-20 16:24 ` [PATCH 2/5] .gitignore: ignore external debug symbols from GCC on macOS SZEDER Gábor
2018-12-20 16:24 ` [PATCH 3/5] travis-ci: don't be '--quiet' when running the tests SZEDER Gábor
2018-12-20 16:24 ` [PATCH 4/5] travis-ci: switch to Xcode 10.1 macOS image SZEDER Gábor
2018-12-20 16:24 ` [PATCH 5/5] travis-ci: build with the right compiler SZEDER Gábor
2019-01-03 16:01 ` Johannes Schindelin
2019-01-17 1:29 ` [PATCH v2 0/5] " SZEDER Gábor
2019-01-17 1:29 ` [PATCH v2 1/5] compat/obstack: fix -Wcast-function-type warnings SZEDER Gábor
2019-01-17 1:29 ` [PATCH v2 2/5] .gitignore: ignore external debug symbols from GCC on macOS SZEDER Gábor
2019-01-17 1:29 ` [PATCH v2 3/5] travis-ci: don't be '--quiet' when running the tests SZEDER Gábor
2019-01-17 13:28 ` Johannes Schindelin
2019-01-17 1:29 ` [PATCH v2 4/5] travis-ci: switch to Xcode 10.1 macOS image SZEDER Gábor
2019-01-17 1:29 ` [PATCH v2 5/5] travis-ci: build with the right compiler SZEDER Gábor
2019-01-17 13:44 ` Johannes Schindelin [this message]
2019-01-17 14:56 ` SZEDER Gábor
2019-01-18 8:40 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1901171439280.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).