From 5c45dcdaa5b352ba03074a5f472ad6988ea4fcda Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Thu, 6 May 2021 18:43:44 -0400
Subject: [PATCH] Build fix: filter-grammar-test: incorrect inclusion flag
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Including src/common causes LTTng files that clash with system headers
to be included before the system headers and breaks the build on
multiple platforms and architectures.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Iff7b6e7000d907dc076a467d223c91569b783861
---
 src/common/Makefile.am           | 1 -
 src/common/filter-grammar-test.c | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e6a88a1fa..317ce37ba 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -184,7 +184,6 @@ noinst_PROGRAMS = filter-grammar-test
 filter_grammar_test_SOURCES = filter-grammar-test.c
 filter_grammar_test_LDADD = \
 	libcommon.la
-filter_grammar_test_CFLAGS = -I $(top_builddir)/src/common
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
diff --git a/src/common/filter-grammar-test.c b/src/common/filter-grammar-test.c
index bd21cf877..aec0a5c67 100644
--- a/src/common/filter-grammar-test.c
+++ b/src/common/filter-grammar-test.c
@@ -17,9 +17,9 @@
 #include <inttypes.h>
 
 #include <common/compat/errno.h>
-#include "common/bytecode/bytecode.h"
-#include "filter/filter-ast.h"
-#include "filter/filter-parser.h"
+#include <common/bytecode/bytecode.h>
+#include <common/filter/filter-ast.h>
+#include <common/filter/filter-parser.h>
 
 /* For error.h */
 int lttng_opt_quiet = 1;
-- 
2.34.1