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

NuttX cmake bug fixes and improvements #13490

Merged
merged 1 commit into from
Nov 16, 2019
Merged

Conversation

dagar
Copy link
Member

@dagar dagar commented Nov 16, 2019

This is an attempt to fix the intermittent MacOS NuttX build failure in the recent upgrade (#13065).

@dagar dagar force-pushed the pr-nuttx_make_defs_race branch 4 times, most recently from d8a7b12 to 620a44b Compare November 16, 2019 16:47
@dagar
Copy link
Member Author

dagar commented Nov 16, 2019

NuttX cmake improvements

  • fix temporary Make.defs copy
  • implement custom macros for COMPILE, COMPILEXX, ASSEMBLE, ARCHIVE to enable ccache properly (if available and enabled)
  • fix NuttX mkdeps

@dagar dagar force-pushed the pr-nuttx_make_defs_race branch 4 times, most recently from a8ad92d to a9b155e Compare November 16, 2019 18:11
@dagar
Copy link
Member Author

dagar commented Nov 16, 2019

The root cause of the failure on MacOS was a race condition regenerating the config.h header between builds nuttx libs and apps. There's a proper dependency at the cmake level now.

@dagar dagar marked this pull request as ready for review November 16, 2019 18:15
@dagar dagar changed the title [WIP]: cmake NuttX init workaround temporary Make.defs isssue NuttX cmake bug fixes and improvements Nov 16, 2019
@dagar dagar force-pushed the pr-nuttx_make_defs_race branch from a9b155e to 5ed5c66 Compare November 16, 2019 19:17
 - fix temporary Make.defs copy
 - implement custom macros for COMPILE, COMPILEXX, ASSEMBLE, ARCHIVE to enable ccache properly (if available and enabled)
 - fix NuttX mkdeps
 - fix libapps race condition with context
@dagar dagar force-pushed the pr-nuttx_make_defs_race branch from 5ed5c66 to 8420103 Compare November 16, 2019 20:10
@dagar dagar merged commit df73a66 into master Nov 16, 2019
@dagar dagar deleted the pr-nuttx_make_defs_race branch November 16, 2019 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant