summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2010-10-05 18:09:00 -0700
committerJesse Gross <jesse@nicira.com>2010-10-05 18:12:05 -0700
commit668aedc070d767d3aa33413e3f918a1e953e0f98 (patch)
treed54b85e089b7238159bcae1eed569676b15bd835
parent7ed7b619e31c7c48c4f6d0dfb411173be96924c5 (diff)
downloadopenvswitch-668aedc070d767d3aa33413e3f918a1e953e0f98.tar.gz
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>
-rw-r--r--datapath/linux-2.6/Kbuild.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/datapath/linux-2.6/Kbuild.in b/datapath/linux-2.6/Kbuild.in
index f08eb9c5e..2158382b0 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))