kernel.mk: avoid using absolute path in targets

[android-x86/device-generic-common.git] / build / tasks / kernel.mk

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 06f9cc2..e6fca56 100644 (file)
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2017 The Android-x86 Open Source Project
+# Copyright (C) 2014-2019 The Android-x86 Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -8,8 +8,6 @@
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 
-export LC_CTYPE := C
-
 ifneq ($(TARGET_NO_KERNEL),true)
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 
@@ -42,9 +40,9 @@ CROSS_COMPILE ?= $(abspath $(TARGET_TOOLS_PREFIX))
 endif
 endif
 
-KBUILD_OUTPUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
+KBUILD_OUTPUT := $(TARGET_OUT_INTERMEDIATES)/kernel
 mk_kernel := + $(hide) $(MAKE) $(if $(filter darwin,$(HOST_OS)),-j$$(sysctl -n hw.ncpu) -l$$(($$(sysctl -n hw.ncpu)+2)),-j$$(nproc) -l$$(($$(nproc)+2))) \
-       -C $(KERNEL_DIR) O=$(KBUILD_OUTPUT) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) \
+       -C $(KERNEL_DIR) O=$(abspath $(KBUILD_OUTPUT)) ARCH=$(TARGET_ARCH) CROSS_COMPILE="$(abspath $(CC_WRAPPER)) $(CROSS_COMPILE)" $(if $(SHOW_COMMANDS),V=1) \
        YACC=$(abspath $(BISON)) LEX=$(abspath $(LEX)) \
        $(KERNEL_CLANG_CLAGS)
 
@@ -60,7 +58,7 @@ KERNEL_DOTCONFIG_FILE := $(KBUILD_OUTPUT)/.config
 KERNEL_ARCH_CHANGED := $(if $(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARGET_KERNEL_ARCH)),\#.)CONFIG_64BIT $(KERNEL_DOTCONFIG_FILE) | wc -l)),FORCE)
 $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
        $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
-       $(hide) ln -sf ../../../../../../external $(@D)
+       $(hide) ln -sf ../../../../../../prebuilts $(@D)
        $(mk_kernel) olddefconfig
 
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
@@ -103,7 +101,7 @@ installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)
 
 .PHONY: kernel $(if $(KERNEL_ARCH_CHANGED),$(KERNEL_HEADERS_COMMON)/linux/binder.h)
-kernel: $(INSTALLED_KERNEL_TARGET)
+kernel: $(INSTALLED_KERNEL_TARGET) $(KERNEL_MODULES_DEP)
 
 endif # TARGET_PREBUILT_KERNEL