Skip to content

Commit be47fbe

Browse files
ggouaillardetjsquyres
authored andcommitted
btl/usnic: fix usnic_btl_run_tests CPPFLAGS
do define the OMPI_LIBMPI_NAME macro via the CPPFLAGS. The issue occurs when Open MPI is configured with --enable-opal-btl-usnic-unit-tests Thanks George Marselis for reporting this issue Refs. #6441 Signed-off-by: Gilles Gouaillardet <[email protected]> (cherry picked from commit b409762)
1 parent 476dee3 commit be47fbe

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

opal/mca/btl/usnic/Makefile.am

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# Copyright (c) 2010-2019 Cisco Systems, Inc. All rights reserved
1515
# Copyright (c) 2015 Intel, Inc. All rights reserved.
1616
# Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
17+
# Copyright (c) 2017 Los Alamos National Security, LLC. All rights
18+
# reserved.
19+
# Copyright (c) 2019 Research Organization for Information Science
20+
# and Technology (RIST). All rights reserved.
1721
# $COPYRIGHT$
1822
#
1923
# Additional copyrights may follow
@@ -104,7 +108,8 @@ libmca_btl_usnic_la_LIBADD = $(opal_ofi_LIBS)
104108

105109
if OPAL_BTL_USNIC_BUILD_UNIT_TESTS
106110
usnic_btl_run_tests_CPPFLAGS = \
107-
-DBTL_USNIC_RUN_TESTS_SYMBOL=\"opal_btl_usnic_run_tests\"
111+
-DBTL_USNIC_RUN_TESTS_SYMBOL=\"opal_btl_usnic_run_tests\" \
112+
-DOMPI_LIBMPI_NAME=\"$(OMPI_LIBMPI_NAME)\"
108113
usnic_btl_run_tests_SOURCES = test/usnic_btl_run_tests.c
109114
usnic_btl_run_tests_LDADD = -ldl
110115
bin_PROGRAMS = usnic_btl_run_tests

0 commit comments

Comments
 (0)