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

Fix Lily58 build with link-time optimization #7181

Merged
merged 1 commit into from
Oct 29, 2019
Merged

Fix Lily58 build with link-time optimization #7181

merged 1 commit into from
Oct 29, 2019

Conversation

bcat
Copy link
Contributor

@bcat bcat commented Oct 27, 2019

Description

Currently the Lily58 keyboard doesn't build with LINK_TIME_OPTIMIZATON_ENABLE = yes due to multiple definition of a couple macros. This PR fixes that.

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

Before this PR,

$ LINK_TIME_OPTIMIZATION_ENABLE=yes make lily58:default

fails with this error:

Compiling: keyboards/lily58/i2c.c                                                                  In file included from 
<command-line>:0:0:
./keyboards/lily58/config.h:27:0: error: "NO_ACTION_MACRO" redefined [-Werror]
 #define NO_ACTION_MACRO
 ^
<command-line>:0:0: note: this is the location of the previous definition
In file included from <command-line>:0:0:
./keyboards/lily58/config.h:28:0: error: "NO_ACTION_FUNCTION" redefined [-Werror]
 #define NO_ACTION_FUNCTION
 ^
<command-line>:0:0: note: this is the location of the previous definition

After this PR, it compiles successfully.

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

@zvecr zvecr added the keyboard label Oct 28, 2019
@zvecr zvecr requested a review from a team October 28, 2019 02:39
@zvecr
Copy link
Member

zvecr commented Oct 29, 2019

Thanks!

@zvecr zvecr merged commit afc5cb7 into qmk:master Oct 29, 2019
@bcat bcat deleted the lily58_lto branch October 29, 2019 01:10
@bcat bcat mentioned this pull request Oct 30, 2019
13 tasks
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants