Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: toolchain: get rid of suffixes variable

Browse Source 
The only variables used so far are CXX, CC and AR. Let's make it
simpler.
This commit is contained in:
Gustavo Jose de Sousa 2016-03-21 19:23:52 -03:00 committed by Lucas De Marchi
parent dbd27a9f39
commit ceda86bbd8
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Tools/ardupilotwaf/toolchain.py
View File

@ -16,14 +16,6 @@ from waflib import Utils, Context
import os
suffixes = dict(
AS='gcc',
AR='ar',
LD='g++',
GDB='gdb',
OBJCOPY='objcopy',
)
def find_realexec_path(cfg, filename, path_list=[]):
if not filename:
return ''
@ -59,12 +51,13 @@ def configure(cfg):
cxx_compiler = cfg.options.check_cxx_compiler or 'g++'
if 'gcc' == c_compiler or 'g++' == cxx_compiler or 'clang' == c_compiler or 'clang++' == cxx_compiler:
toolchain_path = os.path.abspath(os.path.join(find_realexec_path(cfg, prefix + suffixes['AR']), '..'))
toolchain_path = os.path.abspath(os.path.join(find_realexec_path(cfg, prefix + 'ar'), '..'))
cfg.msg('Using toolchain path', toolchain_path)
if 'gcc' == c_compiler or 'g++' == cxx_compiler:
for k in suffixes:
cfg.env[k] = [prefix + suffixes[k]]
cfg.env['AR'] = prefix + 'ar'
cfg.env['CXX'] = prefix + 'g++'
cfg.env['CC'] = prefix + 'gcc'
if 'clang' == c_compiler or 'clang++' == cxx_compiler:
sysroot = cfg.cmd_and_log([prefix + 'gcc', '--print-sysroot'], quiet=Context.BOTH)[:-1]
@ -77,17 +70,17 @@ def configure(cfg):
cfg.env.LINKFLAGS += clang_flags
if 'gcc' == c_compiler:
cfg.env['CC'] = [prefix + 'gcc']
cfg.env['CC'] = prefix + 'gcc'
elif 'clang' == c_compiler:
cfg.env['CC'] = [c_compiler]
cfg.env['AR'] = [prefix + suffixes['AR']]
cfg.env['CC'] = c_compiler
cfg.env['AR'] = prefix + 'ar'
cfg.env.CFLAGS += clang_flags
if 'g++' == cxx_compiler:
cfg.env['CXX'] = [prefix + 'g++']
cfg.env['CXX'] = prefix + 'g++'
elif 'clang++' == cxx_compiler:
cfg.env['CXX'] = [cxx_compiler]
cfg.env['AR'] = [prefix + suffixes['AR']]
cfg.env.CXXFLAGS += clang_flags
cfg.env['CXX'] = cxx_compiler
cfg.env['AR'] = prefix + 'ar'
cfg.env.CXXFLAGS += clang_flags