For unknown reasons opensm, osmtest and libraries were linked with
hardcoded command using g++ linker when vendor sim (ibmgtsim) was
selected. We cannot find any reasonable explanation why it was done
this way, OTOH with newer libtools it creates some issues on ibmgtsim
side. - Remove this completely.
Signed-off-by: Sasha Khapyorsky <[EMAIL PROTECTED]>
---
opensm/opensm/Makefile.am | 10 ----------
opensm/osmtest/Makefile.am | 8 --------
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/opensm/opensm/Makefile.am b/opensm/opensm/Makefile.am
index 06c27cc..7ca4c2a 100644
--- a/opensm/opensm/Makefile.am
+++ b/opensm/opensm/Makefile.am
@@ -69,16 +69,6 @@ else
opensm_CFLAGS = -Wall $(OSMV_CFLAGS) -fno-strict-aliasing
-DVENDOR_RMPP_SUPPORT $(DBGFLAGS) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1
endif
-# for linking with the simulator client library we have to use g++:
-if OSMV_SIM
-USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS)
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-libopensm.la: $(libopensm_la_OBJECTS) $(libopensm_la_DEPENDENCIES)
- $(USEGPPLINK) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS)
$(libopensm_la_LIBADD) $(LIBS)
-opensm$(EXEEXT): $(opensm_OBJECTS) $(opensm_DEPENDENCIES)
- @rm -f opensm$(EXEEXT)
- $(USEGPPLINK) $(opensm_OBJECTS) $(opensm_LDADD) $(LIBS)
-endif
-
# we need to be able to load libraries from local build subtree before make
install
# we always give precedence to local tree libs and then use the pre-installed
ones.
opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm
$(OSMV_LDADD)
diff --git a/opensm/osmtest/Makefile.am b/opensm/osmtest/Makefile.am
index 198c360..236cdcf 100644
--- a/opensm/osmtest/Makefile.am
+++ b/opensm/osmtest/Makefile.am
@@ -20,14 +20,6 @@ osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -DVENDOR_RMPP_SUPPORT
$(DBGFLAGS)
endif
osmtest_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L../opensm
-lopensm $(OSMV_LDADD)
-# for linking with the simulator client library we have to use g++:
-if OSMV_SIM
-USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS)
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-osmtest$(EXEEXT): $(osmtest_OBJECTS) $(osmtest_DEPENDENCIES)
- @rm -f osmtest$(EXEEXT)
- $(USEGPPLINK) $(osmtest_OBJECTS) $(osmtest_LDADD) $(LIBS)
-endif
-
EXTRA_DIST = $(srcdir)/include/osmt_inform.h \
$(srcdir)/include/osmtest_subnet.h \
$(srcdir)/include/osmtest.h \
--
1.5.5.1.178.g1f811
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
