Skip to content

Commit e5d6952

Browse files
committed
build: Expose 3rd-party package CPPFLAGS
In reworking the 3rd-party package support for Libevent and HWLOC, it appears that we missed exporting the opal_<package>_CPPFLAGS variable (despite documentation). Fix that shortcoming. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 6c46da3 commit e5d6952

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

config/opal_config_hwloc.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ AC_DEFUN([_OPAL_CONFIG_HWLOC_INTERNAL], [
162162
# note: because we only ship/commit a tarball (and not the source
163163
# directory), the source is always expanded in the builddir, so we
164164
# only need to add a -I to the builddir.
165-
CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_BUILDDIR/$internal_hwloc_location/include -I$OMPI_TOP_SRCDIR/$internal_hwloc_location/include"
165+
opal_hwloc_CPPFLAGS="-I$OMPI_TOP_BUILDDIR/$internal_hwloc_location/include -I$OMPI_TOP_SRCDIR/$internal_hwloc_location/include"
166+
CPPFLAGS="$CPPFLAGS $opal_hwloc_CPPFLAGS"
166167
# No need to update LDFLAGS, because they will install into
167168
# our tree and in the mean time are referenced by their .la
168169
# files.

config/opal_config_libevent.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ AC_DEFUN([_OPAL_CONFIG_LIBEVENT_INTERNAL], [
192192
# note: because we only ship/commit a tarball (and not the source
193193
# directory), the source is always expanded in the builddir, so we
194194
# only need to add a -I to the builddir.
195-
CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_BUILDDIR/$internal_libevent_location -I$OMPI_TOP_BUILDDIR/$internal_libevent_location/include"
195+
opal_libevent_CPPFLAGS="-I$OMPI_TOP_BUILDDIR/$internal_libevent_location -I$OMPI_TOP_BUILDDIR/$internal_libevent_location/include"
196+
CPPFLAGS="$CPPFLAGS $opal_libevent_CPPFLAGS"
196197
# No need to update LDFLAGS, because they will install into
197198
# our tree and in the mean time are referenced by their .la
198199
# files.

0 commit comments

Comments
 (0)