Commit: b2bbce1d0fed544bb9fdb1c791005175916a0ce5 - build (git)

build

Commit MetaInfo

• Revision: b2bbce1d0fed544bb9fdb1c791005175916a0ce5 (tree)
• Zeit: 2018-12-07 12:34:00
• Autor: Chih-Wei Huang <cwhuang@open...>
• Commiter: server180

Log Message

kernel.mk: use the prebuilt bison of AOSP

Instead of relying on host's bison, just use AOSP's prebuilt bison
to build kernel.

Ändern Zusammenfassung

• modified: core/tasks/kernel.mk

Diff

--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -31,7 +31,7 @@ else
 CROSS_COMPILE ?= $(abspath $(TARGET_TOOLS_PREFIX))
 endif
 KBUILD_OUTPUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
-mk_kernel := + $(hide) $(MAKE) -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1)
+mk_kernel := + $(hide) $(MAKE) -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) YACC=$(abspath $(BISON))
 
 KERNEL_CONFIG_FILE := $(if $(wildcard $(TARGET_KERNEL_CONFIG)),$(TARGET_KERNEL_CONFIG),$(KERNEL_DIR)/$(KERNEL_CONFIG_DIR)/$(TARGET_KERNEL_CONFIG))
 
@@ -48,11 +48,8 @@ $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFC
 	$(hide) ln -sf ../../../../../../external $(@D)
 	$(mk_kernel) oldnoconfig
 
-# bison is needed to build kernel and external modules from source
-BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLE_SUFFIX)
-
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
-$(INSTALLED_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(ACP) $(BISON)
+$(INSTALLED_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(ACP)
 	$(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
 	$(hide) $(ACP) -fp $(BUILT_KERNEL_TARGET) $@
 	$(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install)