diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2012-04-18 17:59:43 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2012-04-18 17:59:43 -0400 |
| commit | 9185a4bfe54b59214f50c68604b6b6de1f7308af (patch) | |
| tree | 941dab1c44d89e7a84c31e04eb4e71e4d180a4df /SConstruct | |
| parent | 858acc681374664dda940450180a825dec5fede4 (diff) | |
| download | mongo-9185a4bfe54b59214f50c68604b6b6de1f7308af.tar.gz | |
some cleaning based on andy's code review
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index cd9b3fdf926..7536ea21258 100644 --- a/SConstruct +++ b/SConstruct @@ -13,12 +13,6 @@ # This file, SConstruct, configures the build environment, and then delegates to # several, subordinate SConscript files, which describe specific build rules. -import os - -EnsureSConsVersion( 1, 1, 0 ) -mysconsroot = ".scons/%s/%s" % ( os.uname()[0] , os.getenv( "HOST" , "nohost" ) ) -SConsignFile( mysconsroot + "/sconsign" ) - import buildscripts import buildscripts.bb import datetime @@ -35,6 +29,10 @@ from buildscripts import utils import libdeps +EnsureSConsVersion( 1, 1, 0 ) +scons_data_dir = ".scons/%s/%s" % ( os.uname()[0] , os.getenv( "HOST" , "nohost" ) ) +SConsignFile( scons_data_dir + "/sconsign" ) + DEFAULT_INSTALL_DIR = "/usr/local" def _rpartition(string, sep): @@ -293,8 +291,8 @@ env = Environment( BUILD_DIR=variantDir, PYSYSPLATFORM=os.sys.platform, PCRE_VERSION='8.30', - CONFIGUREDIR = mysconsroot + '/sconf_temp', - CONFIGURELOG = mysconsroot + '/config.log' + CONFIGUREDIR = scons_data_dir + '/sconf_temp', + CONFIGURELOG = scons_data_dir + '/config.log' ) if has_option('mute'): |