1155 esac |
1155 esac |
1156 + hardcode_libdir_flag_spec_CXX= |
1156 + hardcode_libdir_flag_spec_CXX= |
1157 ;; |
1157 ;; |
1158 |
1158 |
1159 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
1159 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
1160 @@ -15295,7 +15297,8 @@ |
1160 @@ -15284,8 +15286,8 @@ |
|
1161 else |
|
1162 osm_lib_dir=lib |
|
1163 fi |
|
1164 + with_osm_libs=$with_osm/$osm_lib_dir |
|
1165 fi |
|
1166 - with_osm_libs=$with_osm/$osm_lib_dir |
|
1167 |
|
1168 if test -d $with_osm/include/infiniband; then |
|
1169 OSM_BUILD=openib |
|
1170 @@ -15295,7 +15297,7 @@ |
1161 { $as_echo "$as_me:${as_lineno-$LINENO}: OSM: build type $OSM_BUILD" >&5 |
1171 { $as_echo "$as_me:${as_lineno-$LINENO}: OSM: build type $OSM_BUILD" >&5 |
1162 $as_echo "$as_me: OSM: build type $OSM_BUILD" >&6;} |
1172 $as_echo "$as_me: OSM: build type $OSM_BUILD" >&6;} |
1163 |
1173 |
1164 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs" |
1174 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs" |
1165 + with_osm_libs=`echo "$with_osm_libs" | $SED -e "s/\/lib64$/\/lib/g"` |
|
1166 + OSM_LDFLAGS="-L$with_osm_libs" |
1175 + OSM_LDFLAGS="-L$with_osm_libs" |
1167 if test $OSM_BUILD = openib; then |
1176 if test $OSM_BUILD = openib; then |
1168 osm_include_dir="$with_osm/include/infiniband" |
1177 osm_include_dir="$with_osm/include/infiniband" |
1169 osm_extra_includes="-I$with_osm/include" |
1178 osm_extra_includes="-I$with_osm/include" |
1170 @@ -15378,7 +15381,7 @@ |
1179 @@ -15378,7 +15380,7 @@ |
1171 osm_debug_flags= |
1180 osm_debug_flags= |
1172 fi |
1181 fi |
1173 |
1182 |
1174 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
1183 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
1175 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
1184 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |