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

Commit c7a10ddd authored Jan 06, 2012 by Ying Wang

Include toolchain makefile based on the current config.

So we can have the same set of module names in different host arch
/ toolchain version combinations.

Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e

parent c0b74df3

core/combo/TARGET_linux-arm.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

		# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
		ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
		TARGET_TOOLS_PREFIX := \
		prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-
		TARGET_TOOLCHAIN_ROOT := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x
		TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/arm-linux-androideabi-
		endif

		# Only define these if there's actually a gcc in there.

core/combo/TARGET_linux-sh.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@

		# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
		ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
		TARGET_TOOLS_PREFIX := \
		prebuilt/$(HOST_PREBUILT_TAG)/toolchain/sh-4.3.3/bin/sh-linux-gnu-
		TARGET_TOOLCHAIN_ROOT := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/sh-4.3.3
		TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/sh-linux-gnu-
		endif

		TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

core/combo/TARGET_linux-x86.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

		# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
		ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
		TARGET_TOOLS_PREFIX := \
		prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin/i686-android-linux-
		TARGET_TOOLCHAIN_ROOT := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3
		TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-android-linux-
		endif

		TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

libs/host/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,3 +23,5 @@ LOCAL_ACP_UNAVAILABLE:= true

		include $(BUILD_HOST_STATIC_LIBRARY)

		# Include toolchain prebuilt modules if they exist.
		-include $(TARGET_TOOLCHAIN_ROOT)/toolchain.mk