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.

Sign up for GitHub

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

Jump to bottom

conda and make compatibility fixes #40

Merged
merged 2 commits into from Mar 24, 2023
Merged

conda and make compatibility fixes #40

merged 2 commits into from Mar 24, 2023

Conversation

mjuric
Copy link
Contributor

@mjuric mjuric commented Mar 17, 2023

This PR fixes two issues:

  • Makes a small change to how PREFIX is stored, to make it more compatible with conda builds
  • Fixes an issue in the makefile that would add C++ flags to C compiler invocation (I promoted getstrex.c to a .cpp file to make the fix simple; see the note in that commit).

@mjuric
miscell.cpp: update conda PREFIX workaround
44f00f9
@mjuric
rename getstrex.c to getstrex.cpp, compile it with $CXX
26ca430 
getstrex.c is a C file, and could be compiled with the C compiler. However,
the rest of the makefile is only set up for the C++ compiler (specifically,
the logic that builds CXX flags). Rather than build CFLAGS in exactly the
same way, we'll "promote" getstrex.c to C++.

Without this change, the makefile is broken with tools that externally set
CC and CFLAGS (e.g., conda-build).
@Bill-Gray Bill-Gray merged commit b2b380f into Bill-Gray:master Mar 24, 2023
@Bill-Gray
Copy link
Owner

Thank you. I'll keep the issue with .c files in mind... I think that's the only instance, at least at present, where it would be an issue for Find_Orb and most related code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mjuric @Bill-Gray