Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba48cf33 authored by Dan Pasanen's avatar Dan Pasanen Committed by Gerrit Code Review
Browse files

kernel: default to gcc 4.9; auto-set prefix based on TARGET_ARCH 

GCC 4.8 doesn't exist anymore in N.

Change-Id: I5c83e7de97b75ece9a1306cb20b058d9fd30e288
parent 8d74e84f

core/tasks/kernel.mk

+11 −5
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ 
#                                          different from TARGET_KERNEL_ARCH

#   TARGET_USES_UNCOMPRESSED_KERNEL    = 'true' if Kernel is uncompressed,

#                                          optional, defaults to false

#   TARGET_KERNEL_CROSS_COMPILE_PREFIX = Compiler prefix (e.g. aarch64-linux-android-)

#                                          defaults to arm-eabi-

#   TARGET_KERNEL_CROSS_COMPILE_PREFIX = Compiler prefix (e.g. arm-eabi-)

#                                          defaults to arm-linux-androideabi- for arm

#                                                      aarch64-linux-android- for arm64

#                                                      x86_64-linux-android- for x86

#

#   BOARD_KERNEL_IMAGE_NAME            = Built image name, optional,

#                                          defaults to Image.gz on arm64
@@ -210,10 +212,14 @@ KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules 
endif



TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX))

ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_TOOLCHAIN_PREFIX ?= arm-eabi-

else

ifneq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_TOOLCHAIN_PREFIX ?= $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)

else ifeq ($(TARGET_ARCH),arm64)

KERNEL_TOOLCHAIN_PREFIX ?= aarch64-linux-android-

else ifeq ($(TARGET_ARCH),arm)

KERNEL_TOOLCHAIN_PREFIX ?= arm-linux-androideabi-

else ifeq ($(TARGET_ARCH),x86)

KERNEL_TOOLCHAIN_PREFIX ?= x86_64-linux-android-

endif



ifeq ($(KERNEL_TOOLCHAIN),)