Change test_lib to obey --static

1 files changed, 12 insertions, 8 deletions

diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index ab126c9fb..e15bfb2b7 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -46,8 +46,19 @@ rule test_header ( name ) {
   return [ test_flags "-include $(name)" ] ;
 }
 
+requirements = ;
+
+FORCE-STATIC = [ option.get "static" : : "yes" ] ;
+if $(FORCE-STATIC) {
+  requirements += <link>static <runtime-link>static ;
+}
+
 rule test_library ( name ) {
-  return [ test_flags "-l$(name)" ] ;
+  if $(FORCE-STATIC) {
+    return [ test_flags "-l$(name) -static" ] ;
+  } else {
+    return [ test_flags "-l$(name)" ] ;
+  }
 }
 
 {
@@ -59,13 +70,6 @@ rule test_library ( name ) {
   constant CLEANING : $(cleaning) ;
 }
 
-requirements = ;
-
-FORCE-STATIC = [ option.get "static" : : "yes" ] ;
-if $(FORCE-STATIC) {
-  requirements += <link>static <runtime-link>static ;
-}
-
 #Determine if a library can be compiled statically.  
 rule auto-shared ( name : additional * ) {
   additional ?= "" ;