Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

btl/usnic: amend Makefile.am fix from b4097626ab #6459

Merged
merged 1 commit into from
Mar 6, 2019

Conversation

jsquyres
Copy link
Member

@jsquyres jsquyres commented Mar 5, 2019

Use $(AM_CPPFLAGS) in $(usnic_btl_run_tests_CPPFLAGS) so that we don't
have to replicate hard-coded values.

Signed-off-by: Jeff Squyres jsquyres@cisco.com

Refs #6441 #6450

Use $(AM_CPPFLAGS) in $(usnic_btl_run_tests_CPPFLAGS) so that we don't
have to replicate hard-coded values.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
@ggouaillardet
Copy link
Contributor

@jsquyres, though we do not require $(opal_ofi_CPPFLAGS) nor -DBTL_IN_OPAL=1 (and the latter looks counter-intuitive) I have no objection with your changes.

@jsquyres
Copy link
Member Author

jsquyres commented Mar 6, 2019

Yeah, I noticed the -DBTL_IN_OPAL while I was doing this and took a mental note to PR removing that. It's left over from when we transitioned the BTL from the OMPI layer to the OPAL layer; I had some code in there that let me maintain the same BTL code in both OMPI and OPAL (for PR'ing back to release branches), which was quite convenient at the time.

@jsquyres jsquyres merged commit 2bd7d86 into open-mpi:master Mar 6, 2019
@jsquyres jsquyres deleted the pr/usnic-makefile.am-fix branch March 6, 2019 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants