From owner-svn-src-all@freebsd.org Sat May 21 01:32:16 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FFFCB43969; Sat, 21 May 2016 01:32:15 +0000 (UTC) (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id 3E65F2082; Sat, 21 May 2016 01:32:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4L1WDHL033290; Sat, 21 May 2016 01:32:13 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4L1WDII033289; Sat, 21 May 2016 01:32:13 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201605210132.u4L1WDII033289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 21 May 2016 01:32:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300351 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2016 01:32:16 -0000 Author: bdrewery Date: Sat May 21 01:32:13 2016 New Revision: 300351 URL: https://svnweb.freebsd.org/changeset/base/300351 Log: Fetch the __FreeBSD_cc_version as COMPILER_FREEBSD_VERSION. Reviewed by: brooks, bapt, dim Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D6356 Modified: head/share/mk/bsd.compiler.mk Modified: head/share/mk/bsd.compiler.mk ============================================================================== --- head/share/mk/bsd.compiler.mk Sat May 21 01:32:10 2016 (r300350) +++ head/share/mk/bsd.compiler.mk Sat May 21 01:32:13 2016 (r300351) @@ -14,6 +14,8 @@ # against 30300 for gcc likely isn't what you wanted (since versions of gcc # prior to 4.2 likely have no prayer of working). # +# COMPILER_FREEBSD_VERSION is the compiler's __FreeBSD_cc_version value. +# # COMPILER_FEATURES will contain one or more of the following, based on # compiler support for that feature: # @@ -104,7 +106,8 @@ ccache-print-options: .PHONY # Try to import COMPILER_TYPE and COMPILER_VERSION from parent make. # The value is only used/exported for the same environment that impacts # CC and COMPILER_* settings here. -_exported_vars= ${X_}COMPILER_TYPE ${X_}COMPILER_VERSION +_exported_vars= ${X_}COMPILER_TYPE ${X_}COMPILER_VERSION \ + ${X_}COMPILER_FREEBSD_VERSION ${X_}_cc_hash= ${${cc}}${MACHINE}${PATH} ${X_}_cc_hash:= ${${X_}_cc_hash:hash} # Only import if none of the vars are set somehow else. @@ -128,6 +131,7 @@ ${var}= ${${var}.${${X_}_cc_hash}} # generated files - thus there is no compiler. ${X_}COMPILER_TYPE= none ${X_}COMPILER_VERSION= 0 +${X_}COMPILER_FREEBSD_VERSION= 0 .elif !defined(${X_}COMPILER_TYPE) || !defined(${X_}COMPILER_VERSION) _v!= ${${cc}} --version || echo 0.0.0 @@ -151,6 +155,15 @@ ${X_}COMPILER_VERSION!=echo "${_v:M[1-9] .endif .undef _v .endif +.if !defined(${X_}COMPILER_FREEBSD_VERSION) +${X_}COMPILER_FREEBSD_VERSION!= { echo "__FreeBSD_cc_version" | ${${cc}} -E - 2>/dev/null || echo __FreeBSD_cc_version; } | tail -n 1 +# If we get a literal "__FreeBSD_cc_version" back then the compiler +# is a non-FreeBSD build that doesn't support it or some other error +# occurred. +.if ${${X_}COMPILER_FREEBSD_VERSION} == "__FreeBSD_cc_version" +${X_}COMPILER_FREEBSD_VERSION= unknown +.endif +.endif .if ${${X_}COMPILER_TYPE} == "clang" || \ (${${X_}COMPILER_TYPE} == "gcc" && ${${X_}COMPILER_VERSION} >= 40800) @@ -163,6 +176,7 @@ ${X_}COMPILER_FEATURES= # Use CC's values X_COMPILER_TYPE= ${COMPILER_TYPE} X_COMPILER_VERSION= ${COMPILER_VERSION} +X_COMPILER_FREEBSD_VERSION= ${COMPILER_FREEBSD_VERSION} X_COMPILER_FEATURES= ${COMPILER_FEATURES} .endif # ${cc} == "CC" || (${cc} == "XCC" && ${XCC} != ${CC})