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

Commit 7a739f35 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Use hermetic host toolchains."

parents aea1cae4 5e2ebcbe

core/combo/HOST_darwin-x86.mk

+0 −6
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ include $(BUILD_COMBOS)/mac_version.mk 


$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version)

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

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

$(combo_2nd_arch_prefix)HOST_CC  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-gcc

$(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-g++

ifeq ($(mac_sdk_version),10.8)
@@ -42,10 +40,6 @@ ifeq ($(mac_sdk_version),10.8) 
host_toolchain_header := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header)

endif

else

$(combo_2nd_arch_prefix)HOST_CC := gcc

$(combo_2nd_arch_prefix)HOST_CXX := g++

endif # $(HOST_TOOLCHAIN_PREFIX)-gcc exists



# gcc location for clang; to be updated when clang is updated

# HOST_TOOLCHAIN_ROOT is a Darwin-specific define

core/combo/HOST_darwin-x86_64.mk

+0 −6
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ include $(BUILD_COMBOS)/mac_version.mk 


HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1

HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version)

# 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++

ifeq ($(mac_sdk_version),10.8)
@@ -42,10 +40,6 @@ ifeq ($(mac_sdk_version),10.8) 
host_toolchain_header := $(HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include

HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header)

endif

else

HOST_CC := gcc

HOST_CXX := g++

endif # $(HOST_TOOLCHAIN_PREFIX)-gcc exists



# gcc location for clang; to be updated when clang is updated

# HOST_TOOLCHAIN_ROOT is a Darwin-specific define

core/combo/HOST_linux-x86.mk

+0 −3
Original line number Diff line number Diff line
@@ -20,12 +20,9 @@ 
ifeq ($(strip $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)),)

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux-

endif

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

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

$(combo_2nd_arch_prefix)HOST_CC  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)gcc

$(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)g++

$(combo_2nd_arch_prefix)HOST_AR  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)ar

endif # $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)gcc exists



# gcc location for clang; to be updated when clang is updated

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/

core/combo/HOST_linux-x86_64.mk

+0 −3
Original line number Diff line number Diff line
@@ -20,12 +20,9 @@ 
ifeq ($(strip $(HOST_TOOLCHAIN_PREFIX)),)

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

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



# gcc location for clang; to be updated when clang is updated

HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/