d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/build/make.py: drop workaround for cc --version not being parsed

Browse Source 
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 9c6954329a
so we can drop the workaround from make.py.

Reviewed By:	jrtc27
Differential Revision: https://reviews.freebsd.org/D28323
This commit is contained in:
Alex Richardson 2021-02-13 13:54:20 +00:00
parent 5ff2e55e00
commit 88db1cc9f1
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/build/make.py
View File

@ -182,13 +182,6 @@ def default_cross_toolchain():
sys.exit("TARGET= and TARGET_ARCH= must be set explicitly " sys.exit("TARGET= and TARGET_ARCH= must be set explicitly "
"when building on non-FreeBSD") "when building on non-FreeBSD")
# infer values for CC/CXX/CPP # 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": if parsed_args.host_compiler_type == "gcc":
default_cc, default_cxx, default_cpp = ("gcc", "g++", "cpp") default_cc, default_cxx, default_cpp = ("gcc", "g++", "cpp")
# FIXME: this should take values like `clang-9` and then look for # FIXME: this should take values like `clang-9` and then look for
@ -225,8 +218,8 @@ def default_cross_toolchain():
if not shutil.which("strip"): if not shutil.which("strip"):
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
# On macOS systems we have to use /usr/bin/strip. # On macOS systems we have to use /usr/bin/strip.
sys.exit("Cannot find required tool 'strip'. Please install the" sys.exit("Cannot find required tool 'strip'. Please install "
" host compiler and command line tools.") "the host compiler and command line tools.")
if parsed_args.host_compiler_type == "clang": if parsed_args.host_compiler_type == "clang":
strip_binary = "llvm-strip" strip_binary = "llvm-strip"
else: else: