488f656c11
External pmix installs are frequently in non-standard locations and the path to their shared libraries are not ldconfig'd in because there may be multiple pmix installs. The way the configury was set up prior to this patch, the configuration would fail soon after the PMIX config stuff was called because it added some pmix lib stuff to the LDFLAGS, resulting in configury tests for things that require running the configure test to fail. This patch avoids this problem by resetting the LDFLAGS and LIBS back to what they were prior to the run of the external PMIX detection. The CFLAGS setting is left because there are many places in the ompi and opal source code where pmix_common.h needs to be included. Signed-off-by: Howard Pritchard <hppritcha@gmail.com>
35 строки
967 B
Makefile
35 строки
967 B
Makefile
#
|
|
# Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
|
|
# Copyright (c) 2016-2019 Intel, Inc. All rights reserved.
|
|
# Copyright (c) 2020 Triad National Security, LLC. All rights
|
|
# reserved.
|
|
#
|
|
# $COPYRIGHT$
|
|
#
|
|
# Additional copyrights may follow
|
|
#
|
|
# $HEADER$
|
|
#
|
|
|
|
# This is a special component -- its main purpose in life is to have
|
|
# its configure.m4 add some things to CPPFLAGS, LDFLAGS, and
|
|
# LIBS. Hence, there's nothing to build here. :-)
|
|
|
|
# We only ever build this component statically
|
|
|
|
noinst_LTLIBRARIES = libmca_pmix_external.la
|
|
|
|
libmca_pmix_external_la_SOURCES = \
|
|
external.h \
|
|
pmix_external_component.c
|
|
|
|
libmca_pmix_external_la_LIBADD = $(opal_external_pmix_LIBS)
|
|
libmca_pmix_external_la_LDFLAGS = \
|
|
-module -avoid-version $(opal_external_pmix_LDFLAGS)
|
|
|
|
# Conditionally install the header files
|
|
if WANT_INSTALL_HEADERS
|
|
opaldir = $(opalincludedir)/$(subdir)
|
|
nobase_opal_HEADERS = external.h
|
|
endif
|