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

Fix up Arm builds with nix-shell. #8312

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Fix up Arm builds with nix-shell. #8312

merged 1 commit into from
Mar 6, 2020

Conversation

tzarc
Copy link
Member

@tzarc tzarc commented Mar 4, 2020

Description

AVR CFLAGS/ASFLAGS were unconditionally used for all targets, even if they were targeting Arm. This limits the scope to those variables to AVR-specific, as the normal Arm compiler included in Nix actually has these set correctly.

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.
  • 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).

@tzarc tzarc requested a review from a team March 4, 2020 19:00
fauxpark
fauxpark approved these changes Mar 4, 2020
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

#pragma weak

@tzarc tzarc merged commit b438c6f into qmk:master Mar 6, 2020
@tzarc
Copy link
Member Author

tzarc commented Mar 6, 2020

Confirmed working by Hauleth on discord.

@tzarc tzarc deleted the fix-arm-nix-builds branch March 6, 2020 16:07
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@tzarc @c0psrul3
Fix up Arm builds with nix-shell. (qmk#8312)
71d07a3
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Apr 2, 2020
@tzarc @sowbug
Fix up Arm builds with nix-shell. (qmk#8312)
b7bd1c5
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Apr 10, 2020
@tzarc @HokieGeek
Fix up Arm builds with nix-shell. (qmk#8312)
7ba41e2
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@tzarc @kujawakk
Fix up Arm builds with nix-shell. (qmk#8312)
fe9983b
@andresilva andresilva mentioned this pull request May 19, 2020
Closed
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request May 24, 2020
@tzarc @drashna
Fix up Arm builds with nix-shell. (qmk#8312)
1a1e25d
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request May 24, 2020
@tzarc @drashna
Fix up Arm builds with nix-shell. (qmk#8312)
dd79387
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 12, 2020
@tzarc @fdidron
Fix up Arm builds with nix-shell. (qmk#8312)
8eec442
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@tzarc @jakobaa
Fix up Arm builds with nix-shell. (qmk#8312)
9bca546
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
@tzarc @jakeisnt
Fix up Arm builds with nix-shell. (qmk#8312)
07410db
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@tzarc
Fix up Arm builds with nix-shell. (qmk#8312)
b5f431a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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
2 participants
@tzarc @fauxpark