eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More tweaks for setting default compilers

Browse source
This commit is contained in:
Eryn Wells 2014-01-30 20:39:56 -08:00
parent c76f986a86
commit 08880e87ac
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
SConstruct
View file

@ -68,24 +68,29 @@ def get_bool_argument(arg):
return True return True
def set_compiler(env, var, user_compiler, compilers, string=None): def set_compiler(env, var, user_compiler, compilers, compiler_string=None):
if not string:
string = 'compiler'
if user_compiler: if user_compiler:
if which(user_compiler): if which(user_compiler):
env[var] = user_compiler env[var] = user_compiler
else: else:
raise SCons.Errors.UserError('The given compiler does not exist. :-(') raise SCons.Errors.UserError('The given {} does not exist. '
':-('.format(compiler_string))
else: else:
for c in compilers: for c in compilers:
if which(c): if which(c):
env[var] = c env[var] = c
break break
else: else:
raise SCons.Errors.UserError("Couldn't find a viable compiler. " raise SCons.Errors.UserError(("Couldn't find a viable {}. "
"Have you installed one?") "Have you installed one?").format(
compiler_string))
common_env = Environment() common_env = Environment()
set_compiler(common_env, 'CC', CC, ('clang', 'gcc'), 'C') set_compiler(common_env, 'CC', CC, ('clang', 'gcc'), 'C compiler')
set_compiler(common_env, 'CXX', CXX, ('clang++', 'g++'), 'C++') set_compiler(common_env, 'CXX', CXX, ('clang++', 'g++'), 'C++ compiler')
set_compiler(common_env, 'AS', AS, ('gas'), 'assembler')
common_env.Append(CFLAGS='{} -std=c99'.format(CFLAGS)) common_env.Append(CFLAGS='{} -std=c99'.format(CFLAGS))
common_env.Append(CXXFLAGS='{} -std=c++11'.format(CFLAGS)) common_env.Append(CXXFLAGS='{} -std=c++11'.format(CFLAGS))