rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't let a GCC port install override base Clang for FreeBSD 10+

Browse Source
This commit is contained in:
Nick Withers 2015-05-22 07:53:48 +10:00 committed by Chris Johns
parent be7ffbf927
commit d15a7f8861
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source-builder/sb/freebsd.py
View File

@ -88,14 +88,14 @@ def load():
else: else:
cc = '/usr/bin/clang' cc = '/usr/bin/clang'
if not check.check_exe(cc, cc): if not check.check_exe(cc, cc):
raise error.general('no valid cc not found') raise error.general('no valid cc found')
cxx = '/usr/bin/c++' cxx = '/usr/bin/c++'
if check.check_exe(cxx, cxx): if check.check_exe(cxx, cxx):
defines['__cxx'] = cxx defines['__cxx'] = cxx
else: else:
cxx = '/usr/bin/clang++' cxx = '/usr/bin/clang++'
if check.check_exe(cxx, cxx): if check.check_exe(cxx, cxx):
raise error.general('no valid c++ not found') raise error.general('no valid c++ found')
# #
# Assume the compiler is clang and so we need to increase # Assume the compiler is clang and so we need to increase
# bracket depth build build the gcc ARM compiler. # bracket depth build build the gcc ARM compiler.
@ -109,17 +109,17 @@ def load():
# Fix the mess iconv is on FreeBSD 10.0. # Fix the mess iconv is on FreeBSD 10.0.
# #
defines['iconv_includes'] = ('none', 'none', '-I/usr/local/include -L/usr/local/lib') defines['iconv_includes'] = ('none', 'none', '-I/usr/local/include -L/usr/local/lib')
else:
for gv in ['47', '48', '49']: for gv in ['49', '48', '47']:
gcc = '%s-portbld-freebsd%s-gcc%s' % (cpu, version, gv) gcc = '%s-portbld-freebsd%s-gcc%s' % (cpu, version, gv)
if check.check_exe(gcc, gcc): if check.check_exe(gcc, gcc):
defines['__cc'] = gcc defines['__cc'] = gcc
break break
for gv in ['47', '48', '49']: for gv in ['49', '48', '47']:
gxx = '%s-portbld-freebsd%s-g++%s' % (cpu, version, gv) gxx = '%s-portbld-freebsd%s-g++%s' % (cpu, version, gv)
if check.check_exe(gxx, gxx): if check.check_exe(gxx, gxx):
defines['__cxx'] = gxx defines['__cxx'] = gxx
break break
return defines return defines