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 build failure from WITH_DTRACE on Darwin #42146

Merged
merged 2 commits into from
Sep 8, 2021

Conversation

carlocab
Copy link
Contributor

@carlocab carlocab commented Sep 7, 2021

Building WITH_DTRACE=1 off of master fails with syntax errors from
uprobes.d on macOS. I've added a modified uprobes.d that should work
on Darwin and amended src/Makefile to use the appropriate one
depending on the platform.

For reference, the error from building without this change is:

dtrace: failed to compile script /private/tmp/julia/src/uprobes.d: line 5: syntax error near "probe"
make[1]: *** [uprobes.h.gen] Error 1

I'm not super familiar with Julia's Makefiles, so there might be a nicer way to do what I'm trying to do here. Happy to change this where needed.

CC @vchuravy

Building `WITH_DTRACE=1` off of master fails with syntax errors from
`uprobes.d` on macOS. I've added a modified `uprobes.d` that should work
on Darwin and amended `src/Makefile` to use the appropriate one
depending on the platform.

For reference, the error from building without this change is:

    dtrace: failed to compile script /private/tmp/julia/src/uprobes.d: line 5: syntax error near "probe"
    make[1]: *** [uprobes.h.gen] Error 1
@vchuravy
Copy link
Member

vchuravy commented Sep 7, 2021

It seems that on Linux, the file for darwin works as well.

dtrace -G -s src/uprobes-darwin.d -o uprobes.o

So maybe we can get away with just one file?

@carlocab
Copy link
Contributor Author

carlocab commented Sep 7, 2021

I suspected that might be the case, but had no convenient way of testing it. That works for me; will push that change shortly.

The same file seems to work on Linux too.
@carlocab
Copy link
Contributor Author

carlocab commented Sep 8, 2021

Pushed the suggested change.

@vchuravy vchuravy merged commit 9d5de6c into JuliaLang:master Sep 8, 2021
@vchuravy
Copy link
Member

vchuravy commented Sep 8, 2021

Thanks!

@carlocab carlocab deleted the dtrace-darwin branch September 8, 2021 12:20
LilithHafner pushed a commit to LilithHafner/julia that referenced this pull request Feb 22, 2022
LilithHafner pushed a commit to LilithHafner/julia that referenced this pull request Mar 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants