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

configure: fix libunwind and spacetime support #8673

Merged
merged 1 commit into from May 20, 2019

Conversation

Projects
None yet
2 participants
@shindere
Copy link
Contributor

commented May 15, 2019

Since the switch to autoconf in #2139, it was not possible to
enable SpaceTime profiling any longer.

This PR restores the support for both SpaceTime and libunwind.

The MacOSX-specific unwind test works again, too.

@shindere

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

When ready this should of course go in both the 4.08 and 4.09 branches.

@shindere shindere force-pushed the shindere:fix-libunwind-support branch from 62b6b66 to 21e0afb May 15, 2019

@shindere

This comment has been minimized.

Copy link
Contributor Author

commented May 15, 2019

Initially forgot the Changes entry. Fixed.

@shindere shindere force-pushed the shindere:fix-libunwind-support branch from 21e0afb to 391df9f May 16, 2019

@damiendoligez
Copy link
Member

left a comment

Just one remark that you may want to take into account, or not.

Either way, this PR looks good to me.

[AS_IF([test x"$LIBUNWIND_INCLUDE_DIR" = "x"],
[LIBUNWIND_INCLUDE_DIR="$with_libunwind/include"])
AS_IF([test x"$LIBUNWIND_LIB_DIR" = "x"],
[LIBUNWIND_LIB_DIR="$with_libunwind/lib"])

This comment has been minimized.

Copy link
@damiendoligez

damiendoligez May 16, 2019

Member

IIUC, this piece of code means that, if I pass a value for --with-libunwind it will be taken as a prefix for the include and lib directories. For example if I pass "no" or "true"...

Is this really needed?

@damiendoligez damiendoligez added this to the 4.08 milestone May 16, 2019

@shindere

This comment has been minimized.

Copy link
Contributor Author

commented May 16, 2019

@shindere shindere force-pushed the shindere:fix-libunwind-support branch 2 times, most recently from 45c9319 to 551db0e May 16, 2019

@shindere shindere force-pushed the shindere:fix-libunwind-support branch from 551db0e to 330b96a May 20, 2019

@shindere

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

Updated the generated configure and rebased on latest trunk

@damiendoligez damiendoligez merged commit b694e84 into ocaml:trunk May 20, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@shindere shindere deleted the shindere:fix-libunwind-support branch May 20, 2019

@shindere

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

Cherry-picked to:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.