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

Commit cbe162e9 authored by Andrew Hsieh's avatar Andrew Hsieh
Browse files

Fix HOST_TOOLCHAIN_PREFIX 

Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
parent ce156811

core/combo/HOST_linux-x86.mk

+6 −6
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ endef 
# Previously the prebiult host toolchain is used only for the sdk build,

# that's why we have "sdk" in the path name.

ifeq ($(strip $(HOST_TOOLCHAIN_PREFIX)),)

HOST_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk

HOST_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk/

endif

# Don't do anything if the toolchain is not there

ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)/gcc)))

HOST_CC  := $(HOST_TOOLCHAIN_PREFIX)/gcc

HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)/g++

HOST_AR  := $(HOST_TOOLCHAIN_PREFIX)/ar

endif # $(HOST_TOOLCHAIN_PREFIX)/gcc exists

ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)gcc)))

HOST_CC  := $(HOST_TOOLCHAIN_PREFIX)gcc

HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)g++

HOST_AR  := $(HOST_TOOLCHAIN_PREFIX)ar

endif # $(HOST_TOOLCHAIN_PREFIX)gcc exists



ifneq ($(strip $(BUILD_HOST_64bit)),)

# By default we build everything in 32-bit, because it gives us