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

Commit df2b4b3a authored by Ying Wang's avatar Ying Wang
Browse files

Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX. 

Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.

Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
parent 51bd3fa0

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -169,6 +169,14 @@ include $(BUILD_SYSTEM)/combo/select.mk 
combo_target := TARGET_

include $(BUILD_SYSTEM)/combo/select.mk



# Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX

# if only TARGET_TOOLS_PREFIX is passed to the make command.

ifndef TARGET_TOOLCHAIN_ROOT

TARGET_TOOLCHAIN_ROOT := $(patsubst %/, %, $(dir $(TARGET_TOOLS_PREFIX)))

TARGET_TOOLCHAIN_ROOT := $(patsubst %/, %, $(dir $(TARGET_TOOLCHAIN_ROOT)))

TARGET_TOOLCHAIN_ROOT := $(wildcard $(TARGET_TOOLCHAIN_ROOT))

endif



# Pick a Java compiler.

include $(BUILD_SYSTEM)/combo/javac.mk