Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks

2016-09-08 08:56:49 +02:00
parent dd142e72eb d7aacc51d4
commit d43f492889
9 changed files with 52 additions and 4 deletions
@@ -1,6 +1,8 @@
 boost/1.55.0         stable     gcc/4.7.4 b:Python/3.4.0 
 boost/1.55.0         stable     gcc/4.8.3 b:Python/3.4.0 
 boost/1.55.0         stable     gcc/4.8.4 b:Python/3.4.0 
+boost/1.55.0         stable     gcc/4.8.5 b:Python/2.7.11
 boost/1.55.0         stable     gcc/4.9.2 b:Python/3.4.0 
 boost/1.58.0         unstable   gcc/4.8.4 b:Python/3.4.0 
+boost/1.58.0         unstable   gcc/4.8.5 b:Python/2.7.11 
 boost/1.58.0         unstable   gcc/4.9.3 b:Python/2.7.11
@@ -19,7 +19,7 @@ pbuild::build() {
 		--layout=system \
 		--without-mpi \
 		variant=release \
-		link=shared \
+		link=shared,static \
 		threading=multi \
 		stage
 }
@@ -32,7 +32,7 @@ pbuild::install() {
 		--layout=system \
 		--without-mpi \
 		variant=release \
-		link=shared \
+		link=shared,static \
 		threading=multi \
 		install
 }