From bf5225b0445cc1b7b69c2a80162d3c1b514a27cf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 20 Jun 2018 14:12:42 -0400 Subject: [PATCH 10/17] Fix a makeguids building problem with generics.h. Guard generics.h with EFIVAR_BUILD_ENVIRONMENT to keep it from interfering with the makeguids build if libefivar.so isn't around already. Signed-off-by: Peter Jones --- src/generics.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/generics.h b/src/generics.h index e6af2fad79e..66be4bd76ab 100644 --- a/src/generics.h +++ b/src/generics.h @@ -17,6 +17,7 @@ * */ +#ifndef EFIVAR_BUILD_ENVIRONMENT #ifndef LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H #define LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H 1 @@ -182,3 +183,4 @@ generic_append_variable(efi_guid_t guid, const char *name, } #endif /* LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H */ +#endif /* EFIVAR_BUILD_ENVIRONMENT */ -- 2.17.1