From owner-dev-commits-src-all@freebsd.org Sat Apr 10 13:29:58 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A06C05E6C86; Sat, 10 Apr 2021 13:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FHbTL3w8lz3Jpk; Sat, 10 Apr 2021 13:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F89B1223B; Sat, 10 Apr 2021 13:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ADTwGh001943; Sat, 10 Apr 2021 13:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ADTwf6001942; Sat, 10 Apr 2021 13:29:58 GMT (envelope-from git) Date: Sat, 10 Apr 2021 13:29:58 GMT Message-Id: <202104101329.13ADTwf6001942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alex Richardson Subject: git: 350123947584 - stable/13 - tools/build/make.py: drop workaround for cc --version not being parsed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 350123947584fb26062eb4b4d7c36185ed3b2830 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 13:29:58 -0000 The branch stable/13 has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=350123947584fb26062eb4b4d7c36185ed3b2830 commit 350123947584fb26062eb4b4d7c36185ed3b2830 Author: Alex Richardson AuthorDate: 2021-02-13 13:54:20 +0000 Commit: Alex Richardson CommitDate: 2021-04-10 12:55:54 +0000 tools/build/make.py: drop workaround for cc --version not being parsed Previously bsd.compiler.mk was not able to detect the compiler type for Ubuntu's /usr/bin/cc unless we were invoking the /usr/bin/gcc symlink. This problem has been fixed by 9c6954329a9285547881ddd60e393b7c55ed30c4 so we can drop the workaround from make.py. Reviewed By: jrtc27 Differential Revision: https://reviews.freebsd.org/D28323 (cherry picked from commit 88db1cc9f197a376817ce27ba269348666bbd4b7) --- tools/build/make.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/build/make.py b/tools/build/make.py index e692fef11e05..bc6d8fb449bb 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -182,13 +182,6 @@ if __name__ == "__main__": sys.exit("TARGET= and TARGET_ARCH= must be set explicitly " "when building on non-FreeBSD") # infer values for CC/CXX/CPP - - if sys.platform.startswith( - "linux") and parsed_args.host_compiler_type == "cc": - # FIXME: bsd.compiler.mk doesn't handle the output of GCC if it - # is /usr/bin/cc on Ubuntu since it doesn't contain the GCC string. - parsed_args.host_compiler_type = "gcc" - if parsed_args.host_compiler_type == "gcc": default_cc, default_cxx, default_cpp = ("gcc", "g++", "cpp") # FIXME: this should take values like `clang-9` and then look for @@ -225,8 +218,8 @@ if __name__ == "__main__": if not shutil.which("strip"): if sys.platform.startswith("darwin"): # On macOS systems we have to use /usr/bin/strip. - sys.exit("Cannot find required tool 'strip'. Please install the" - " host compiler and command line tools.") + sys.exit("Cannot find required tool 'strip'. Please install " + "the host compiler and command line tools.") if parsed_args.host_compiler_type == "clang": strip_binary = "llvm-strip" else: