diff options
author | Chris Dyer <cdyer@cab.ark.cs.cmu.edu> | 2012-05-23 00:36:29 -0400 |
---|---|---|
committer | Chris Dyer <cdyer@cab.ark.cs.cmu.edu> | 2012-05-23 00:36:29 -0400 |
commit | 2c217893e517eaeb288c70b51816015a3a8a8124 (patch) | |
tree | d763fb53f7682cb21bc7bbac1fe183974ea3ff9f | |
parent | bc52c53ec2872a0e41b830308f11400d77b38e76 (diff) |
support for cab, pay attention to BOOST_ROOT in bjam
-rw-r--r-- | environment/LocalConfig.pm | 8 | ||||
-rw-r--r-- | jam-files/sanity.jam | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm index abae1e3b..b9549c6e 100644 --- a/environment/LocalConfig.pm +++ b/environment/LocalConfig.pm @@ -15,9 +15,15 @@ my $CCONFIG = { 'StarCluster' => { 'HOST_REGEXP' => qr/compute-\d+\.internal$/, 'JobControl' => 'qsub', - 'QSubMemFlag' => '-l mem', + 'QSubMemFlag' => '-l mem=', 'DefaultJobs' => 20, }, + 'Cab' => { + 'HOST_REGEXP' => qr/cab\.ark\.cs\.cmu\.edu$|cab\.local$/, + 'JobControl' => 'qsub', + 'QSubMemFlag' => '-l mem=', + 'DefaultJobs' => 8 + }, 'LTICluster' => { 'HOST_REGEXP' => qr/^cluster\d+\.lti\.cs\.cmu\.edu$/, 'JobControl' => 'qsub', diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index 9c75c247..2a5fc381 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -74,6 +74,7 @@ if $(with-macports) { } else { with-boost = [ option.get "with-boost" ] ; + with-boost ?= [ os.environ "BOOST_ROOT" ] ; if $(with-boost) { L-boost-search = -L$(with-boost)/lib" "-L$(with-boost)/lib64 ; boost-search = <search>$(with-boost)/lib <search>$(with-boost)/lib64 ; |