Skip to content

fix compilation on freebsd - #34671

Merged
wfurt merged 3 commits into
dotnet:masterfrom
wfurt:freebsd_cgroup
Apr 8, 2020
Merged

fix compilation on freebsd#34671
wfurt merged 3 commits into
dotnet:masterfrom
wfurt:freebsd_cgroup

Conversation

@wfurt

@wfurt wfurt commented Apr 8, 2020

Copy link
Copy Markdown
Member

regression caused by #34334:

Scanning dependencies of target cee_wks
/home/furt/github/wfurt-runtime2/src/coreclr/src/gc/unix/cgroup.cpp:30:10: fatal error: 'sys/vfs.h' file not found
#include <sys/vfs.h>
         ^~~~~~~~~~~
1 error generated.
src/gc/CMakeFiles/clrgc.dir/build.make:296: recipe for target 'src/gc/CMakeFiles/clrgc.dir/unix/cgroup.cpp.o' failed
make[2]: *** [src/gc/CMakeFiles/clrgc.dir/unix/cgroup.cpp.o] Error 1

It may be better long run include vfs.h only if exist but this is fix follows current pattern based on OS.

@wfurt wfurt added os-freebsd FreeBSD OS area-PAL-coreclr only for closed issues labels Apr 8, 2020
@wfurt
wfurt requested a review from janvorli April 8, 2020 02:39
janvorli
janvorli approved these changes Apr 8, 2020
View reviewed changes

@janvorli janvorli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@wfurt
wfurt merged commit 17e31ee into dotnet:master Apr 8, 2020
@wfurt
wfurt deleted the freebsd_cgroup branch April 8, 2020 17:21
@ghost ghost locked as resolved and limited conversation to collaborators Dec 9, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@stephentoub stephentoub stephentoub approved these changes
@janvorli janvorli janvorli approved these changes

Assignees

No one assigned

Labels

area-PAL-coreclr only for closed issues os-freebsd FreeBSD OS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wfurt @stephentoub @janvorli