Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

build: 提交

build


Commit MetaInfo

修订版b2bbce1d0fed544bb9fdb1c791005175916a0ce5 (tree)
时间2018-12-07 12:34:00
作者Chih-Wei Huang <cwhuang@open...>
Commiterserver180

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.

更改概述

差异

--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -31,7 +31,7 @@ else
3131 CROSS_COMPILE ?= $(abspath $(TARGET_TOOLS_PREFIX))
3232 endif
3333 KBUILD_OUTPUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
34-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)
34+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))
3535
3636 KERNEL_CONFIG_FILE := $(if $(wildcard $(TARGET_KERNEL_CONFIG)),$(TARGET_KERNEL_CONFIG),$(KERNEL_DIR)/$(KERNEL_CONFIG_DIR)/$(TARGET_KERNEL_CONFIG))
3737
@@ -48,11 +48,8 @@ $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFC
4848 $(hide) ln -sf ../../../../../../external $(@D)
4949 $(mk_kernel) oldnoconfig
5050
51-# bison is needed to build kernel and external modules from source
52-BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLE_SUFFIX)
53-
5451 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
55-$(INSTALLED_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(ACP) $(BISON)
52+$(INSTALLED_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(ACP)
5653 $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
5754 $(hide) $(ACP) -fp $(BUILT_KERNEL_TARGET) $@
5855 $(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install)
Show on old repository browser