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

Fix which dtrace path check #3229

Merged
merged 1 commit into from
Jul 23, 2019
Merged

Fix which dtrace path check #3229

merged 1 commit into from
Jul 23, 2019

Conversation

slfritchie
Copy link
Contributor

Fix a GNU Make macro bug that prevents make use=dtrace to work
correctly on FreeBSD and Linux+SystemTap platforms. I don't
understand exactly why, but using $(shell which dtrace 2> /dev/null)
inside of the USE_CHECK macro definition always results in the
empty string.

When moved outside of the macro definition, plus using += to
update the value of $(DTRACE), works correctly on both
FreeBSD's GNU Make 4.2.1 and Ubuntu Xenial/16.04's GNU Make 4.1.

@slfritchie slfritchie added the changelog - fixed Automatically add "Fixed" CHANGELOG entry on merge label Jul 17, 2019
@SeanTAllen
Copy link
Member

@slfritchie the changelog bot is currently not working. can you manually add a CHANGELOG entry?

@SeanTAllen
Copy link
Member

@slfritchie you need to rebase against the latest ponyc master. your code still requires pcre2 but that no longer exists in the CI images.

Fix a GNU Make macro expansion that prevents `make use=dtrace` to work
correctly on FreeBSD and Linux+SystemTap platforms.
Tested on FreeBSD's GNU Make 4.2.1 and Ubuntu Xenial/16.04's GNU Make 4.1.
@SeanTAllen SeanTAllen merged commit 3c48176 into master Jul 23, 2019
@SeanTAllen SeanTAllen deleted the dtrace-which-fix branch July 23, 2019 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog - fixed Automatically add "Fixed" CHANGELOG entry on merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants