From owner-svn-ports-head@freebsd.org Mon May 28 09:04:31 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46244F76169; Mon, 28 May 2018 09:04:31 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC88A847DF; Mon, 28 May 2018 09:04:30 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEF033185; Mon, 28 May 2018 09:04:30 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4S94UeV072280; Mon, 28 May 2018 09:04:30 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4S94USN072279; Mon, 28 May 2018 09:04:30 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201805280904.w4S94USN072279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Mon, 28 May 2018 09:04:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471032 - head/lang/gcc7 X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/lang/gcc7 X-SVN-Commit-Revision: 471032 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 May 2018 09:04:31 -0000 Author: gerald Date: Mon May 28 09:04:30 2018 New Revision: 471032 URL: https://svnweb.freebsd.org/changeset/ports/471032 Log: Forward port r469788 from lang/gcc6: Filter the -mretpoline command-line option, which is understood by recent versions of clang (and used in the context of the Spectre security issues), but not GCC (which uses different options for the same) from CFLAGS and CXXFLAGS. This avoids the build of this port via bootstrap, which is the default and leverages both the system compiler (clang in most cases) plus a just built version GCC, to fail due to the latter not knowing -mretpoline. PR: 228205 Submitted by: rozhuk.im@gmail.com Modified: head/lang/gcc7/Makefile Modified: head/lang/gcc7/Makefile ============================================================================== --- head/lang/gcc7/Makefile Mon May 28 09:04:17 2018 (r471031) +++ head/lang/gcc7/Makefile Mon May 28 09:04:30 2018 (r471032) @@ -36,6 +36,8 @@ USES= compiler cpe gmake iconv libtool makeinfo perl5 USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes +CFLAGS:= ${CFLAGS:N-mretpoline} +CXXFLAGS:= ${CXXFLAGS:N-mretpoline} OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFAULT= BOOTSTRAP