diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2022-10-20 12:48:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 12:48:11 -0700 |
| commit | b3e1096e1d110a9a7fdae3020b9d09f4915015fe (patch) | |
| tree | b225b885d2906c49422870711032bb965c947a1d /generate | |
| parent | 009b287303fb016e960b5da22b045e250311d372 (diff) | |
| parent | 3fd0f940408fc01a2c52c5be5f2beb0218a3d907 (diff) | |
| download | acpica-b3e1096e1d110a9a7fdae3020b9d09f4915015fe.tar.gz | |
Merge pull request #802 from valentindavid/valentindavid/nowerror
Allow disabling of -Werror
Diffstat (limited to 'generate')
| -rw-r--r-- | generate/efi/Makefile.config | 6 | ||||
| -rw-r--r-- | generate/unix/Makefile.config | 5 | ||||
| -rw-r--r-- | generate/unix/iasl/Makefile | 22 |
3 files changed, 23 insertions, 10 deletions
diff --git a/generate/efi/Makefile.config b/generate/efi/Makefile.config index ada0be211..da49657bd 100644 --- a/generate/efi/Makefile.config +++ b/generate/efi/Makefile.config @@ -150,7 +150,6 @@ CWARNINGFLAGS = \ -Wall\ -Wbad-function-cast\ -Wdeclaration-after-statement\ - -Werror\ -Wformat=2\ -Wmissing-declarations\ -Wmissing-prototypes\ @@ -162,6 +161,11 @@ CWARNINGFLAGS = \ -Wmissing-parameter-type\ -Wold-style-declaration\ -Wtype-limits + +ifneq ($(NOWERROR),TRUE) +CWARNINGFLAGS += -Werror +endif + # # Extra warning flags (for possible future use) # diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config index b46634367..0deeb1411 100644 --- a/generate/unix/Makefile.config +++ b/generate/unix/Makefile.config @@ -203,7 +203,6 @@ CWARNINGFLAGS = \ -Wall\ -Wbad-function-cast\ -Wdeclaration-after-statement\ - -Werror\ -Wformat=2\ -Wmissing-declarations\ -Wmissing-prototypes\ @@ -213,6 +212,10 @@ CWARNINGFLAGS = \ -Wpointer-arith\ -Wundef +ifneq ($(NOWERROR),TRUE) +CWARNINGFLAGS += -Werror +endif + # # Common gcc 4+ warning flags # diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile index 7e0b05c3c..8fde63d46 100644 --- a/generate/unix/iasl/Makefile +++ b/generate/unix/iasl/Makefile @@ -291,6 +291,12 @@ CFLAGS += \ -I$(ASL_COMPILER)\ -I$(OBJDIR) +ifeq ($(NOWERROR),TRUE) +WERROR_FLAGS= +else +WERROR_FLAGS=-Werror +endif + # # Common Rules # @@ -361,32 +367,32 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse # $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< |