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

tests: add "include-fixed" GCC directory to include directories #415

Merged
merged 1 commit into from
Sep 10, 2021

Conversation

diabonas
Copy link
Contributor

@diabonas diabonas commented Sep 9, 2021

On Arch Linux, the GCC version of limits.h is in the include-fixed instead of the include directory. It needs to be included in the include directories list, otherwise attempting to compile the test suite fails with the following error:

In file included from /usr/include/efivar/efivar-dp.h:22,
                 from /usr/include/efivar/efivar.h:238,
                 from include/test.h:51,
                 from shim.h:68,
                 from csv.c:6:
/usr/include/limits.h:124:16: fatal error: limits.h: No such file or directory
  124 | # include_next <limits.h>
      |                ^~~~~~~~~~
compilation terminated.

Copy link
Member

@frozencemetery frozencemetery left a comment

Choose a reason for hiding this comment

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

A comment in test.mk indicating that this is for Arch would be nice. Otherwise, while have to add this isn't ideal, the change looks fine to me.

On Arch Linux, the GCC version of "limits.h" is in the "include-fixed" instead
of the "include" directory. It needs to be included in the include directories
list, otherwise attempting to compile the test suite fails with the following
error:

In file included from /usr/include/efivar/efivar-dp.h:22,
                 from /usr/include/efivar/efivar.h:238,
                 from include/test.h:51,
                 from shim.h:68,
                 from csv.c:6:
/usr/include/limits.h:124:16: fatal error: limits.h: No such file or directory
  124 | # include_next <limits.h>
      |                ^~~~~~~~~~
compilation terminated.
@diabonas
Copy link
Contributor Author

A comment in test.mk indicating that this is for Arch would be nice.

Sure, done :) I don't think adding "inline" comments in a variable definition continued over multiple lines using backslashes is possible in a Makefile, so used a separate addtion to CFLAGS at the very end instead (which builds fine as well).

Copy link
Member

@frozencemetery frozencemetery left a comment

Choose a reason for hiding this comment

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

Yeah, I think like this is fine. (If order became tricky, it could be another variable that gets added where you had it originally.)

@vathpela vathpela merged commit c1a84dc into rhboot:main Sep 10, 2021
@diabonas diabonas deleted the fix-test-suite-arch branch September 11, 2021 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants