shim-isystem.patch (2876B)
1 diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile 2 index 89fd5cd..0ce35fa 100644 3 --- a/Cryptlib/Makefile 4 +++ b/Cryptlib/Makefile 5 @@ -8,7 +8,7 @@ FEATUREFLAGS += -nostdinc 6 7 INCLUDES = -I$(CRYPTDIR) -I$(CRYPTDIR)/Include \ 8 $(EFI_INCLUDES) \ 9 - -isystem $(TOPDIR)/include/system \ 10 + -I $(TOPDIR)/include/system \ 11 -isystem $(shell $(CC) -print-file-name=include) 12 13 WARNFLAGS += -Wno-unused-parameter 14 diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile 15 index 795f471..ab17495 100644 16 --- a/Cryptlib/OpenSSL/Makefile 17 +++ b/Cryptlib/OpenSSL/Makefile 18 @@ -15,7 +15,7 @@ INCLUDES = -I$(OSSLDIR) -I$(CRYPTDIR) -I$(OSSLDIR)/Include/ \ 19 -I$(OSSLDIR)/crypto -I$(CRYPTDIR)/Include $(EFI_INCLUDES) \ 20 -I$(OSSLDIR)/crypto/asn1 -I$(OSSLDIR)/crypto/evp \ 21 -I$(OSSLDIR)/crypto/modes -I$(OSSLDIR)/crypto/include \ 22 - -isystem $(TOPDIR)/include/system \ 23 + -I $(TOPDIR)/include/system \ 24 -isystem $(shell $(CC) -print-file-name=include) 25 26 FEATUREFLAGS += -nostdinc 27 diff --git a/Make.defaults b/Make.defaults 28 index dfed9c4..c5bb900 100644 29 --- a/Make.defaults 30 +++ b/Make.defaults 31 @@ -104,7 +104,7 @@ INCLUDES = -nostdinc \ 32 -I$(TOPDIR)/Cryptlib -I$(TOPDIR)/Cryptlib/Include \ 33 -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH_GNUEFI) -I$(EFI_INCLUDE)/protocol \ 34 -I$(TOPDIR)/include -iquote $(TOPDIR) -iquote $(shell pwd) \ 35 - -isystem $(TOPDIR)/include/system \ 36 + -I $(TOPDIR)/include/system \ 37 -isystem $(shell $(CC) $(ARCH_CFLAGS) -print-file-name=include) 38 39 override DEFAULT_FEATUREFLAGS = \ 40 @@ -127,7 +127,7 @@ override DEFAULT_WARNFLAGS = \ 41 $(call update-variable,WARNFLAGS) 42 43 override DEFAULT_WERRFLAGS = \ 44 - -Werror 45 + 46 $(call update-variable,WERRFLAGS) 47 48 CFLAGS = $(FEATUREFLAGS) \ 49 diff --git a/Makefile b/Makefile 50 index 24ac314..de58284 100644 51 --- a/Makefile 52 +++ b/Makefile 53 @@ -171,10 +171,10 @@ lib/lib.a: | $(TOPDIR)/lib/Makefile $(wildcard $(TOPDIR)/include/*.[ch]) 54 $(MAKE) VPATH=$(TOPDIR)/lib TOPDIR=$(TOPDIR) -C lib -f $(TOPDIR)/lib/Makefile 55 56 post-process-pe : $(TOPDIR)/post-process-pe.c 57 - $(HOSTCC) -std=gnu11 -Og -g3 -Wall -Wextra -Wno-missing-field-initializers -Werror -o $@ $< 58 + $(HOSTCC) -std=gnu11 -Og -g3 -Wall -Wextra -Wno-missing-field-initializers -o $@ $< 59 60 buildid : $(TOPDIR)/buildid.c 61 - $(HOSTCC) -I/usr/include -Og -g3 -Wall -Werror -Wextra -o $@ $< -lelf 62 + $(HOSTCC) -I/usr/include -Og -g3 -Wall -Wextra -o $@ $< -lelf 63 64 $(BOOTCSVNAME) : 65 @echo Making $@ 66 diff --git a/lib/Makefile b/lib/Makefile 67 index f81c5c9..20a47b6 100644 68 --- a/lib/Makefile 69 +++ b/lib/Makefile 70 @@ -11,7 +11,7 @@ INCLUDES = $(EFI_INCLUDES) \ 71 -I$(CRYPTDIR)/Include/ \ 72 -I$(CRYPTDIR) \ 73 -I$(TOPDIR) \ 74 - -isystem $(TOPDIR)/include/system \ 75 + -I $(TOPDIR)/include/system \ 76 -isystem $(shell $(CC) -print-file-name=include) 77 78 CLANG_BUGS = $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)