diff options
Diffstat (limited to 'scons/gallium.py')
| -rw-r--r-- | scons/gallium.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index f4e82e8e0a..1f9cd3d920 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -156,6 +156,12 @@ def symlink(target, source, env): os.remove(target) os.symlink(os.path.basename(source), target) +def install_program(env, source): + source = str(source[0]) + target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'bin') + target_name = str(source) + env.InstallAs(os.path.join(target_dir, target_name), source) + def install_shared_library(env, source, version = ()): source = str(source[0]) version = tuple(map(str, version)) @@ -169,6 +175,7 @@ def install_shared_library(env, source, version = ()): last = env.Command(os.path.join(target_dir, target_name), last, action) def createInstallMethods(env): + env.AddMethod(install_program, 'InstallProgram') env.AddMethod(install_shared_library, 'InstallSharedLibrary') @@ -236,6 +243,8 @@ def generate(env): env['build'] = build_dir env.SConsignFile(os.path.join(build_dir, '.sconsign')) env.CacheDir('build/cache') + env['CONFIGUREDIR'] = os.path.join(build_dir, 'conf') + env['CONFIGURELOG'] = os.path.join(os.path.abspath(build_dir), 'config.log') # Parallel build if env.GetOption('num_jobs') <= 1: @@ -370,7 +379,6 @@ def generate(env): '-Wno-long-long', '-ffast-math', '-fmessage-length=0', # be nice to Eclipse - '-fno-strict-aliasing', # we violate strict pointer aliasing rules ] cflags += [ '-Werror=declaration-after-statement', |