From 6098b84294186d590685d13ba021925db3efc8d7 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 19 Feb 2015 05:35:38 -0800 Subject: [PATCH] libfabric: pass the appropriate LDFLAGS to libfabric components When compiling against an external libfabric, ensure to also pass the appropriate -L flags so that the compiler/linker can find it. --- ompi/mca/mtl/ofi/Makefile.am | 6 ++++-- opal/mca/btl/usnic/Makefile.am | 6 ++++-- opal/mca/common/libfabric/configure.m4 | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ompi/mca/mtl/ofi/Makefile.am b/ompi/mca/mtl/ofi/Makefile.am index 15f6e87bc0..3e8a9e7966 100644 --- a/ompi/mca/mtl/ofi/Makefile.am +++ b/ompi/mca/mtl/ofi/Makefile.am @@ -1,7 +1,7 @@ # # Copyright (c) 2013-2014 Intel, Inc. All rights reserved # -# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -45,8 +45,10 @@ endif mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources) +mca_mtl_ofi_la_LDFLAGS = \ + $(opal_common_libfabric_LDFLAGS) \ + -module -avoid-version mca_mtl_ofi_la_LIBADD = $(opal_common_libfabric_LIBADD) -mca_mtl_ofi_la_LDFLAGS = -module -avoid-version noinst_LTLIBRARIES = $(component_noinst) libmca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources) diff --git a/opal/mca/btl/usnic/Makefile.am b/opal/mca/btl/usnic/Makefile.am index 7ce5d66ae8..2c1d2c23de 100644 --- a/opal/mca/btl/usnic/Makefile.am +++ b/opal/mca/btl/usnic/Makefile.am @@ -11,7 +11,7 @@ # All rights reserved. # Copyright (c) 2006 Sandia National Laboratories. All rights # reserved. -# Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -88,7 +88,9 @@ endif mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component) mca_btl_usnic_la_SOURCES = $(component_sources) -mca_btl_usnic_la_LDFLAGS = -module -avoid-version +mca_btl_usnic_la_LDFLAGS = \ + $(opal_common_libfabric_LDFLAGS) \ + -module -avoid-version mca_btl_usnic_la_LIBADD = $(opal_common_libfabric_LIBADD) noinst_LTLIBRARIES = $(lib) diff --git a/opal/mca/common/libfabric/configure.m4 b/opal/mca/common/libfabric/configure.m4 index 2a4a62e16b..1b921b835c 100644 --- a/opal/mca/common/libfabric/configure.m4 +++ b/opal/mca/common/libfabric/configure.m4 @@ -50,6 +50,7 @@ AC_DEFUN([MCA_opal_common_libfabric_CONFIG],[ # This is for components that build with libfabric support AC_SUBST(opal_common_libfabric_CPPFLAGS) + AC_SUBST(opal_common_libfabric_LDFLAGS) AC_SUBST(opal_common_libfabric_LIBADD) # This is for building the libfabric component itself @@ -294,6 +295,7 @@ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_SETUP_LIBFABRIC_EXTERNAL],[ [opal_common_libfabric_happy=1], [opal_common_libfabric_happy=0]) + opal_common_libfabric_LDFLAGS="-L$opal_libfabric_libdir" opal_common_libfabric_LIBADD="-lfabric" ])