Ticket #8499: boost_1_53_0-cray.pgi.diff

boostcpp.jam

@@ -152 +152 @@
         # libFoo.1.2.3.dylib format. AIX linkers do not accept version suffixes
         # either. Pgi compilers can not accept a library with version suffix.
         if $(type) = SHARED_LIB &&
-          ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix &&
-          ! [ $(property-set).get <toolset> ] in pgi
+          ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix
         {
             result = $(result).$(BOOST_VERSION)  ;
         }

tools/build/v2/tools/pgi.jam

@@ -16 +16 @@
 feature.extend toolset : pgi ;
 toolset.inherit pgi : unix ;
 generators.override pgi.prebuilt : builtin.lib-generator ;
+generators.override pgi.prebuilt : builtin.prebuilt ;
 generators.override pgi.searched-lib-generator : searched-lib-generator ;
 
 # Documentation and toolchain description located
@@ -117 +118 @@
     SPACE on $(targets) = " " ;
 }
 
-# reddish can only link statically and, somehow, the presence of -Bdynamic on the link line 
+# reddish can only link statically and, somehow, the presence of -Wl,-Bdynamic on the link line 
 # marks the executable as a dynamically linked exec even though no dynamic libraries are supplied.
 # Yod on redstorm refuses to load an executable that is dynamically linked.
 # removing the dynamic link options should get us where we need to be on redstorm.
-# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME)
+# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bstatic -l$(FINDLIBS-ST) -Bdynamic -l$(FINDLIBS-SA) -B$(LINK-RUNTIME)
+    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-B$(LINK-RUNTIME)
 }
 
 # Slight mods for dlls
@@ -133 +134 @@
     SPACE on $(targets) = " " ;
 }
 
-# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" -h$(<[1]:D=) -G "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME)
+# "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" -h$(<[1]:D=) -G "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
 
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -shared -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" -Wl,-h -Wl,$(<[1]:D=) "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME)
+    "$(CONFIG_COMMAND)" $(OPTIONS) -shared -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<[-1])" "$(>)" -Wl,-h -Wl,$(<[1]:D=) "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
 }
 
 actions updated together piecemeal pgi.archive