compiler-rt build broken on mac: 'os/lock.h' file not found

[llvmbot]

Bugzilla Link	44682
Resolution	FIXED
Resolved on	Feb 19, 2020 05:17
Version	unspecified
OS	Windows NT
Blocks	#43900
Reporter	LLVM Bugzilla Contributor
CC	@zmodem

Extended Description

compiler-rt/lib/tsan/rtl/tsan_interceptors_mac.cpp:26:10: fatal error: 'os/lock.h' file not found

This was added in 4a9b747 and reworked in 894abb4#diff-4427dded557d38884822428fb1cb5296.

I don't have a mac to inspect myself, but according to our automation's build logs, we used the 10.11 SDK in the build that this failure occurred in.

Is this code expected to build successfully with that SDK? Should there be a __has_include` like some nearby code uses?

[zmodem]

Julian, can you take a look?

[llvmbot]

This was fixed by c32d809 on the release/10.x branch.

[zmodem]

Fixes should normally be applied to master first and then cherry-picked back to the release branch.

In this case, the build is still broken on master.

Julian, is there a plan for fixing that?

[llvmbot]

My understanding was that Julian was planning to explicitly bump the requirement to SDK 10.12 on master. (I'm ok with that, FWIW.) Does that sound alright?

[zmodem]

For those following, this seems to be happening in https://reviews.llvm.org/D74501

Since the 10.x concern is addressed, I guess we can close the bug now.