projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel-build: ignore runtime config options during reconfig
[oweals/openwrt.git]
/
include
/
kernel.mk
diff --git
a/include/kernel.mk
b/include/kernel.mk
index 975cf455c4f3aefaa7e103496d4a460194215a5e..439e910ebf0c173a97ca35ea9d6fef91fb350714 100644
(file)
--- a/
include/kernel.mk
+++ b/
include/kernel.mk
@@
-77,7
+77,7
@@
else
TARGET_MODULES_DIR:=$(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
ifneq ($(TARGET_BUILD),1)
TARGET_MODULES_DIR:=$(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
ifneq ($(TARGET_BUILD),1)
- PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+ PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(
if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(
PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
endif
endif
endif
endif
@@
-104,6
+104,7
@@
endif
KERNEL_MAKE = $(MAKE) $(KERNEL_MAKEOPTS)
KERNEL_MAKE_FLAGS = \
KERNEL_MAKE = $(MAKE) $(KERNEL_MAKEOPTS)
KERNEL_MAKE_FLAGS = \
+ KCFLAGS="$(call iremap,$(BUILD_DIR),$(notdir $(BUILD_DIR)))" \
HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
CROSS_COMPILE="$(KERNEL_CROSS)" \
ARCH="$(LINUX_KARCH)" \
HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
CROSS_COMPILE="$(KERNEL_CROSS)" \
ARCH="$(LINUX_KARCH)" \
@@
-129,7
+130,8
@@
ifdef CONFIG_USE_SPARSE
KERNEL_MAKEOPTS += C=1 CHECK=$(STAGING_DIR_HOST)/bin/sparse
endif
KERNEL_MAKEOPTS += C=1 CHECK=$(STAGING_DIR_HOST)/bin/sparse
endif
-ifeq ($(HOST_OS),Darwin)
+ifneq ($(HOST_OS),Linux)
+ KERNEL_MAKEOPTS += CONFIG_STACK_VALIDATION=
export SKIP_STACK_VALIDATION:=1
endif
export SKIP_STACK_VALIDATION:=1
endif