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

sys.cpp: fix code fallbacks for older Darwin #739

Merged
merged 3 commits into from
Feb 5, 2024

Conversation

barracuda156
Copy link
Contributor

Not sure why it was conditioned on Clang at all, since clock_gettime is provided by SDK and not compiler. Fix that.
Include AvailabilityMacros.h – apparently nothing in the codebase does that (or did I miss it?).
Amend fallback code for threadid for older macOS.

@barracuda156
Copy link
Contributor Author

Failure on Ubuntu CI is irrelevant:

- [C++]  /home/runner/work/occa/occa/src/utils/mutex.cpp
[27](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:28)
 - [C++]  /home/runner/work/occa/occa/src/utils/hash.cpp
[28](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:29)
 - [C++]  /home/runner/work/occa/occa/src/utils/exception.cpp
[29](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:30)
 - [C++]  /home/runner/work/occa/occa/src/utils/io.cpp
[30](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:31)
/usr/bin/bash: line 1: clang++-12: command not found
[31](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:32)
make: *** [Makefile:149: /home/runner/work/occa/occa/obj/utils/hash.o] Error 127
[32](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:33)
make: *** Waiting for unfinished jobs....
[33](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:34)
 - [C++]  /home/runner/work/occa/occa/src/utils/logging.cpp
[34](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:35)
/usr/bin/bash: line 1: clang++-12: command not found
[35](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:36)
/usr/bin/bash: line 1: clang++-12: command not found
[36](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:37)
make: *** [Makefile:149: /home/runner/work/occa/occa/obj/utils/mutex.o] Error 127
[37](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:38)
make: *** [Makefile:149: /home/runner/work/occa/occa/obj/utils/exception.o] Error 127
[38](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:39)
/usr/bin/bash: line 1: clang++-12: command not found
[39](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:40)
make: *** [Makefile:149: /home/runner/work/occa/occa/obj/utils/logging.o] Error 127
[40](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:41)
/usr/bin/bash: line 1: clang++-12: command not found
[41](https://github.com/libocca/occa/actions/runs/7752370647/job/21141750677?pr=739#step:10:42)
make: *** [Makefile:149: /home/runner/work/occa/occa/obj/utils/io.o] Error 127

@kris-rowe kris-rowe changed the base branch from main to development February 5, 2024 17:00
@kris-rowe kris-rowe merged commit 5656546 into libocca:development Feb 5, 2024
1 of 6 checks passed
@barracuda156 barracuda156 deleted the darwin branch February 5, 2024 18:09
kris-rowe added a commit that referenced this pull request Feb 5, 2024
kris-rowe added a commit that referenced this pull request Feb 5, 2024
kris-rowe added a commit that referenced this pull request Mar 12, 2024
@barracuda156
Copy link
Contributor Author

@kris-rowe I think I have missed this. Was there some special reason to have it broken back? The change from 3cba084 looks wrong. I guess, instead a macro should be moved, so that we have MacOS fixed again, but without affecting anything else.

@kris-rowe
Copy link
Member

@kris-rowe I think I have missed this. Was there some special reason to have it broken back? The change from 3cba084 looks wrong. I guess, instead a macro should be moved, so that we have MacOS fixed again, but without affecting anything else.

I have a feeling it broke the GitHub CI testing for Linux. The updates in #758 look like good and handle all cases.

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