Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 32737 | Differences between
and this patch

Collapse All | Expand All

(-)vmmon-only/Makefile.kernel (-10 lines)
Lines 11-30 Link Here
11
11
12
CC_WARNINGS := -Wall -Wstrict-prototypes 
12
CC_WARNINGS := -Wall -Wstrict-prototypes 
13
CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) 
13
CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) 
14
15
ifeq ($(shell $(GREP) 'FIX_IO_APIC_BASE_0' $(HEADER_DIR)/asm/fixmap.h 2>/dev/null),)
16
CC_OPTS += -DVMWARE__FIX_IO_APIC_BASE=FIX_IO_APIC_BASE
17
else
18
CC_OPTS += -DVMWARE__FIX_IO_APIC_BASE=FIX_IO_APIC_BASE_0
14
CC_OPTS += -DVMWARE__FIX_IO_APIC_BASE=FIX_IO_APIC_BASE_0
19
endif
20
21
ifneq ($(shell $(GREP) 'struct poll_wqueues' $(HEADER_DIR)/linux/poll.h 2>/dev/null),)
22
CC_OPTS += -DVMW_HAVE_EPOLL
15
CC_OPTS += -DVMW_HAVE_EPOLL
23
endif
24
25
CC_OPTS += -DVMW_USING_KBUILD
16
CC_OPTS += -DVMW_USING_KBUILD
26
27
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
17
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
28
18
29
EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
19
EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
(-)vmmon-only/Makefile (-1 / +5 lines)
Lines 76-89 Link Here
76
MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
76
MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
77
77
78
$(DRIVER_KO):
78
$(DRIVER_KO):
79
ifdef EXTRAVERSION
80
	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) EXTRAVERSION=$(EXTRAVERSION) modules
81
else
79
	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
82
	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
83
endif
80
84
81
else
85
else
82
86
83
ifneq ($(VM_CCVER), $(VMCCVER))
87
ifneq ($(VM_CCVER), $(VMCCVER))
84
$(warning *** Inappropriate build environment: you wanted to use gcc \
88
$(warning *** Inappropriate build environment: you wanted to use gcc \
85
 version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).)
89
 version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).)
86
$(error For proper build you'll have to replace $(CC) with symbolic \
90
$(error For proper build you will have to replace $(CC) with symbolic \
87
 link to $(VM_CC))
91
 link to $(VM_CC))
88
endif
92
endif
89
93

Return to bug 32737