Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Bug 1056337 - Upgrading the toolchain used for B2G ICS builds (r=mwu) #81

Merged
merged 1 commit into from Oct 21, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/combo/TARGET_linux-arm.mk
Expand Up @@ -47,6 +47,14 @@ TARGET_TOOLS_PREFIX := \
prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-
endif

ifeq ($(strip $(GECKO_TOOLS_PREFIX)),)
# Look for the existence of a better toolchain
gcc_toolchain_path := $(firstword $(wildcard prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi*/bin))
ifneq ($(strip $(wildcard $(gcc_toolchain_path))),)
GECKO_TOOLS_PREFIX := $(gcc_toolchain_path)/arm-linux-androideabi-
endif
endif

# Only define these if there's actually a gcc in there.
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
ifneq ($(wildcard $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)),)
Expand Down