From: Jesse Gross <jesse@nicira.com>
Date: Wed, 6 Oct 2010 01:09:00 +0000 (-0700)
Subject: datapath: Force our include directory to be first.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=668aedc070d767d3aa33413e3f918a1e953e0f98;p=openvswitch

datapath: Force our include directory to be first.

XenServer puts our header files in the standard system search path
by default.  This is normally OK, except when we introduce new things
which aren't in those headers.  Since the system picks up the older files
first this leads to undefined sysmbols.

Signed-off-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/linux-2.6/Kbuild.in b/datapath/linux-2.6/Kbuild.in
index f08eb9c5..2158382b 100644
--- a/datapath/linux-2.6/Kbuild.in
+++ b/datapath/linux-2.6/Kbuild.in
@@ -11,7 +11,6 @@ include $(srcdir)/Modules.mk
 EXTRA_CFLAGS := -DVERSION=\"$(VERSION)\"
 EXTRA_CFLAGS += -I$(srcdir)/.. 
 EXTRA_CFLAGS += -I$(builddir)/..
-EXTRA_CFLAGS += -I$(top_srcdir)/include
 ifeq '$(BUILDNR)' '0'
 EXTRA_CFLAGS += -DBUILDNR=\"\"
 else
@@ -23,7 +22,7 @@ EXTRA_CFLAGS += -include $(builddir)/kcompat.h
 # These include directories have to go before -I$(KSRC)/include.
 # NOSTDINC_FLAGS just happens to be a variable that goes in the
 # right place, even though it's conceptually incorrect.
-NOSTDINC_FLAGS += -I$(srcdir)/compat-2.6 -I$(srcdir)/compat-2.6/include 
+NOSTDINC_FLAGS += -I$(top_srcdir)/include -I$(srcdir)/compat-2.6 -I$(srcdir)/compat-2.6/include 
 
 obj-m := $(patsubst %,%_mod.o,$(build_modules))