at 18.09-beta 3.0 kB view raw
1diff --git a/vboxdrv/Makefile b/vboxdrv/Makefile 2index e262c61..4af8dac 100644 3--- a/vboxdrv/Makefile 4+++ b/vboxdrv/Makefile 5@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE 6 MOD_OBJS += SUPDrvDTrace.o 7 endif 8 9-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 10+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 11 ifdef VBOX_WITH_NATIVE_DTRACE 12 MOD_INCL += -I/usr/include/linux -I/usr/include 13 endif 14@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK 15 endif 16 17 # build defs 18-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \ 19+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h \ 20 -fno-omit-frame-pointer -fno-pie 21 22 include $(obj)/Makefile.include.footer 23diff --git a/vboxnetadp/Makefile b/vboxnetadp/Makefile 24index e262c61..4af8dac 100644 25--- a/vboxnetadp/Makefile 26+++ b/vboxnetadp/Makefile 27@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \ 28 math/gcc/umoddi3.o 29 endif 30 31-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 32+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 33 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ 34 -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ 35 -Wno-declaration-after-statement 36@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE 37 endif 38 39 # build defs 40-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie 41+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie 42 43 include $(obj)/Makefile.include.footer 44diff --git a/vboxnetflt/Makefile b/vboxnetflt/Makefile 45index e262c61..4af8dac 100644 46--- a/vboxnetflt/Makefile 47+++ b/vboxnetflt/Makefile 48@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ 49 math/gcc/umoddi3.o 50 endif 51 52-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 53+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 54 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ 55 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \ 56 -Wno-declaration-after-statement 57@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE 58 endif 59 60 # build defs 61-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie 62+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie 63 64 include $(obj)/Makefile.include.footer 65diff --git a/vboxpci/Makefile b/vboxpci/Makefile 66index e262c61..4af8dac 100644 67--- a/vboxpci/Makefile 68+++ b/vboxpci/Makefile 69@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \ 70 math/gcc/umoddi3.o 71 endif 72 73-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) 74+MOD_INCL = $(addprefix -I$(INCLUDE_BASE)/$(MOD_NAME),/ /include /r0drv/linux) 75 MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \ 76 -DRT_WITH_VBOX -DVBOX_WITH_HARDENING 77 ifeq ($(BUILD_TARGET_ARCH),amd64) 78@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE 79 endif 80 81 # build defs 82-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie 83+MOD_CFLAGS = -include include/VBox/SUPDrvMangling.h -fno-pie 84 85 include $(obj)/Makefile.include.footer