From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D25781F405 for ; Thu, 20 Dec 2018 16:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733006AbeLTQZ1 (ORCPT ); Thu, 20 Dec 2018 11:25:27 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54859 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731218AbeLTQZZ (ORCPT ); Thu, 20 Dec 2018 11:25:25 -0500 Received: by mail-wm1-f68.google.com with SMTP id a62so2662137wmh.4 for ; Thu, 20 Dec 2018 08:25:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QEcxTjJqEgLAtiumJ2DCmPWwPKffAOTL0rDTlg9xRp8=; b=PfGIImKeUQI2epLg3RBnkDimnazW9TadhaellNZlSnFU2kXdG5COSGbheHj7OOxb5V Aj5n6VjIC1WSySJnBSp1sZEPSdJUqFG17SXveUTwGYKqDrkqSDvc7IiGbmJJDwKZs8HU eF5yng/MfK8Pvjv3j/OsYZldY2kHubYnVlNFEQtGYm9ohTIOCPe8YyyUe5nEizsVkTeu 8BASuzrVfIiem7CMimAwuyv/oi/mAYkV/Km6EFl3Hi5sctwVQ21puARFO2x5kLpgvX1f 5dyfXUGIezVgmtmOo0HZlqUqDh1bf3a2OmB8YiQ6zVOLEFJE5hj4OGxoxKviOz0XFuXz by1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QEcxTjJqEgLAtiumJ2DCmPWwPKffAOTL0rDTlg9xRp8=; b=XDfVz8isMfEyNVamO/Mm9xYAh9sVHVHhSkUvaS+QLA/Y8vBGgjuslNsW6CSx7yW2OU bWzbLquYxmBCybdxlQ174Jkygwa4HC0jDmrO3LRIaBtfYLLEFnBwtl/W6XLvZTaiBM7H Hkh8C5hrWaROCCoZZUWWIF83WXufZOdQtByNiG21D7R9uonwkdFxgYqV9x56SdmMR4zD QVMAfZWSTZ7Rg4KCP46HCqh5Hy1jFdhlOmRSLXszCGmOooVNuUq48GKVwg4u6J/nKzF0 Kec0wgwZWd0nL/D76jXvxf+ouqImHmmr1yMrbC3TRnlvGqh1Fv23r7aQNqhjpITM8r8+ NqNQ== X-Gm-Message-State: AA+aEWZkXe67z4bG83+hsEpnBL2il3PcTAMjpXpEN+dTMkygwxWxtSBs m5nSNBom5CEoOieCWUooZXo= X-Google-Smtp-Source: AFSGD/VUnj10MPNrLFuQdie2t1ctg4Xkq8dq285QwwCugefcISAWoBvacRFTUKADj8HbjoX7eQiU4g== X-Received: by 2002:a1c:11c1:: with SMTP id 184mr11459991wmr.59.1545323122478; Thu, 20 Dec 2018 08:25:22 -0800 (PST) Received: from localhost.localdomain (x4db1e5de.dyn.telefonica.de. [77.177.229.222]) by smtp.gmail.com with ESMTPSA id 200sm8980566wmw.31.2018.12.20.08.25.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Dec 2018 08:25:21 -0800 (PST) From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= To: Junio C Hamano Cc: Jonathan Nieder , Johannes Schindelin , git@vger.kernel.org, =?UTF-8?q?SZEDER=20G=C3=A1bor?= Subject: [PATCH 5/5] travis-ci: build with the right compiler Date: Thu, 20 Dec 2018 17:24:52 +0100 Message-Id: <20181220162452.17732-6-szeder.dev@gmail.com> X-Mailer: git-send-email 2.20.1.151.gec613c4b75 In-Reply-To: <20181220162452.17732-1-szeder.dev@gmail.com> References: <20181220162452.17732-1-szeder.dev@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Our 'Makefile' hardcodes the compiler to build Git as 'CC = cc'. This 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 --- 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.151.gec613c4b75