diff -ur boost_1_53_0/tools/build/v2/tools/cray.jam boost_1_53_0.2/tools/build/v2/tools/cray.jam
--- boost_1_53_0/tools/build/v2/tools/cray.jam	2012-04-25 22:35:55.000000000 -0500
+++ boost_1_53_0.2/tools/build/v2/tools/cray.jam	2013-04-20 20:51:44.000000000 -0500
@@ -39,6 +39,13 @@
     }      
     # If we can't find 'CC' anyway, at least show 'CC' in the commands
     command ?= CC ;
+
+  # set link flags
+  flags cray.link FINDLIBS-ST : [
+    feature.get-values <find-static-library> : $(options) ] : unchecked ;
+
+  flags cray.link FINDLIBS-SA : [
+    feature.get-values <find-shared-library> : $(options) ] : unchecked ;
         
     common.handle-options cray : $(condition) : $(command) : $(options) ;               
 }
@@ -58,19 +65,24 @@
 flags cray.compile OPTIONS <optimization>space : -O1 ;
 
 flags cray.compile OPTIONS <cflags> ;
+flags cray.compile OPTIONS <link>shared : -fPIC ;
 flags cray.compile.c++ OPTIONS <cxxflags> ;
 flags cray.compile DEFINES <define> ;
 flags cray.compile INCLUDES <include> ;
 flags cray.link OPTIONS <linkflags> ;
+flags cray.link OPTIONS <link>shared : -fPIC ;
 
-flags cray.link LIBPATH <library-path> ;
+flags cray.link LINKPATH <library-path> ;
 flags cray.link LIBRARIES <library-file> ;
 flags cray.link FINDLIBS-ST <find-static-library> ;
 flags cray.link FINDLIBS-SA <find-shared-library> ;
+flags cray.link LINK-RUNTIME <runtime-link>static : static ;
+flags cray.link LINK-RUNTIME <runtime-link>shared : dynamic ;
+flags cray.link RPATH <dll-path> ;
 
 actions link bind LIBRARIES
 {
-    $(CONFIG_COMMAND) $(OPTIONS) -o "$(<)" -L$(LIBPATH) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA)
+    $(CONFIG_COMMAND) $(OPTIONS)  -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA)
 }
 
 # When creating dynamic libraries, we don't want to be warned about unresolved
@@ -80,7 +92,7 @@
 
 actions link.dll bind LIBRARIES
 {
-    $(CONFIG_COMMAND) -shared $(OPTIONS) -o "$(<[1])" -L$(LIBPATH)  "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA)
+    $(CONFIG_COMMAND) -shared $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<[1])" "$(>)" -Wl,-h -Wl,$(<[1]:D=) "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA)
 }