[riot-commits] [RIOT-OS/RIOT] 45dad9: Makefile.include: check FEATURES_CONFLICT against ...

Kaspar Schleiser kaspar at schleiser.de
Thu Apr 12 23:09:45 CEST 2018


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: 45dad9a9d10c9ce6cf31a11079fa9b133167274a
      https://github.com/RIOT-OS/RIOT/commit/45dad9a9d10c9ce6cf31a11079fa9b133167274a
  Author: cladmi <hartergaetan at gmail.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M Makefile.include

  Log Message:
  -----------
  Makefile.include: check FEATURES_CONFLICT against FEATURES_USED

The FEATURES_CONFLICT check should be done on used features to also
test for included optional features.


  Commit: 8ba55c4da868cbf7c40bf085ed7b5809f0bd3694
      https://github.com/RIOT-OS/RIOT/commit/8ba55c4da868cbf7c40bf085ed7b5809f0bd3694
  Author: Kaspar Schleiser <kaspar at schleiser.de>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M Makefile.include

  Log Message:
  -----------
  Merge pull request #8925 from cladmi/pr/makefileinclude/features_conflict

Makefile.include: check FEATURES_CONFLICT against FEATURES_USED


Compare: https://github.com/RIOT-OS/RIOT/compare/c11932ae2a6d...8ba55c4da868


More information about the commits mailing list