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.

Sign up for GitHub

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

Jump to bottom

Workaround in Makefile for recursive rule matching #15988

Merged
merged 3 commits into from Jan 25, 2022
Merged

Workaround in Makefile for recursive rule matching #15988

merged 3 commits into from Jan 25, 2022

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Jan 22, 2022 •
edited

Description

  • Match with grep rather than recursive calls
  • Use python to minimise any environment issues
  • Try not to break things...

Some crude perf testing seems to suggest its roughly the same on msys, and maybe marginally faster under wsl.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added the core label Jan 22, 2022
@zvecr zvecr marked this pull request as ready for review January 22, 2022 18:03
@zvecr zvecr changed the title Bodge for recursive rule matching Workaround in Makefile for recursive rule matching Jan 22, 2022
@zvecr zvecr added the bug label Jan 22, 2022
@zvecr zvecr requested a review from a team January 22, 2022 18:04
fauxpark
fauxpark approved these changes Jan 25, 2022
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment •
edited

Choose a reason for hiding this comment

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

This plus the other recent makefile improvements make compiling on my vanilla MSYS2 install work again (and much, much faster) 👍

@tzarc tzarc merged commit 7df3717 into qmk:develop Jan 25, 2022
@zvecr zvecr mentioned this pull request Jan 30, 2022
Merged
@zvecr zvecr mentioned this pull request Feb 28, 2022
Closed
sekigon-gonnoc pushed a commit to sekigon-gonnoc/qmk_firmware that referenced this pull request Jun 24, 2022
@zvecr @sekigon-gonnoc
Workaround in Makefile for recursive rule matching (qmk#15988)
bd22653 
* Bodge for recursive rule matching

* Bodge for recursive rule matching - force python3

* Tidy up
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tzarc tzarc tzarc approved these changes

@fauxpark fauxpark fauxpark approved these changes

Assignees
No one assigned
Labels
bug core
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zvecr @tzarc @fauxpark