-
Notifications
You must be signed in to change notification settings - Fork 160
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
Make the root Makefile macOS compatible #2614
Conversation
config.m4
Outdated
@@ -306,7 +306,7 @@ EOT | |||
if test "$PHP_DDTRACE_SIDECAR_MOCKGEN" != "-"; then | |||
ddtrace_mockgen_invocation="HOST= TARGET= $PHP_DDTRACE_SIDECAR_MOCKGEN" | |||
else | |||
ddtrace_mockgen_invocation="cd \"$ext_srcdir/components-rs/php_sidecar_mockgen\"; HOST= TARGET= CARGO_TARGET_DIR=\$(builddir)/target/ \$(DDTRACE_CARGO) run" | |||
ddtrace_mockgen_invocation="cd \"$ext_srcdir/components-rs/php_sidecar_mockgen\"; HOST=$(rustc -vV | sed -n 's|host: ||p') TARGET=$(rustc -vV | sed -n 's|host: ||p') CARGO_TARGET_DIR=\$(builddir)/target/ \$(DDTRACE_CARGO) run" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't rely on rustc being in PATH (that's also why we do have e.g. AC_CHECK_TOOL(DDTRACE_CARGO, cargo, [:])
for cargo).
If this is specifically a problem with our Makefile, it must be an interaction with the Makefile. After all, it works when run isolated. I'd rather fix the Makefile than changing config.m4 here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the context, it seems the host
& target
settings require a non-empty string for non-Linux platform.
It works on macOS when run isolated because the cc
crate is locked to version 1.0.83
where this restriction does not seem to exist.
The error occurs with our Makefile because the latest cc
crate version is used instead (1.0.92
at the time of writing).
But to avoid the dependency on the rustc
binary, I moved the detection to the sidecar mockgen code directly.
WDYT?
fadc225
to
2de75af
Compare
BenchmarksBenchmark execution time: 2024-04-15 07:36:47 Comparing candidate commit 54775b9 in PR branch Found 0 performance improvements and 4 performance regressions! Performance is the same for 174 metrics, 0 unstable metrics. scenario:PDOBench/benchPDOBaseline-opcache
scenario:PDOBench/benchPDOOverhead-opcache
scenario:PDOBench/benchPDOOverheadWithDBM-opcache
scenario:TraceSerializationBench/benchSerializeTrace
|
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #2614 +/- ##
============================================
+ Coverage 77.64% 79.21% +1.57%
Complexity 2226 2226
============================================
Files 226 200 -26
Lines 25942 21942 -4000
Branches 986 0 -986
============================================
- Hits 20142 17382 -2760
+ Misses 5274 4560 -714
+ Partials 526 0 -526
Flags with carried forward coverage won't be shown. Click here to find out more. see 26 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, looks good then :-)
2de75af
to
54775b9
Compare
Description
Make
make install
works out of the box on MacOS, like on Linux.Reviewer checklist