X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=696718c8eb445341d714094c9f8c09a19fa35fa8;hb=1e3f7bfc9ae4c35f75e6843dda451fde7c107e5c;hp=0e10818ba17bd3e4b840b8b944f343f9f9f6d406;hpb=2de70fe23f320ce4f559e37057fe07b7af99cf5a;p=mesa.git diff --git a/SConstruct b/SConstruct index 0e10818ba17..696718c8eb4 100644 --- a/SConstruct +++ b/SConstruct @@ -1,7 +1,7 @@ ####################################################################### # Top-level SConstruct # -# For example, invoke scons as +# For example, invoke scons as # # scons build=debug llvm=yes machine=x86 # @@ -12,13 +12,13 @@ # build='debug' # llvm=True # machine='x86' -# +# # Invoke # # scons -h # # to get the full list of options. See scons manpage for more info. -# +# import os import os.path @@ -36,7 +36,7 @@ common.AddOptions(opts) env = Environment( options = opts, tools = ['gallium'], - toolpath = ['#scons'], + toolpath = ['#scons'], ENV = os.environ, ) @@ -53,7 +53,7 @@ else: print 'scons: warning: targets option is deprecated; pass the targets on their own such as' print print ' scons %s' % ' '.join(targets) - print + print COMMAND_LINE_TARGETS.append(targets) @@ -80,16 +80,18 @@ env.Append(CPPPATH = [ '#/src/gallium/winsys', ]) -if env['msvc']: - env.Append(CPPPATH = ['#include/c99']) - # for debugging #print env.Dump() +# Add a check target for running tests +check = env.Alias('check') +env.AlwaysBuild(check) + + ####################################################################### -# Invoke host SConscripts -# +# Invoke host SConscripts +# # For things that are meant to be run on the native host build machine, instead # of the target machine. # @@ -115,9 +117,6 @@ if env['crosscompile'] and not env['embedded']: host_env['hostonly'] = True assert host_env['crosscompile'] == False - if host_env['msvc']: - host_env.Append(CPPPATH = ['#include/c99']) - target_env = env env = host_env Export('env')