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

Commit d3b5d574 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable." 

* commit 'ce40d5f9':
  More consistent use of 64-bit build variable.
parents 042c8a06 ce40d5f9

core/combo/HOST_darwin-x86_64.mk

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
# Configuration for Darwin (Mac OS X) on x86_64.

# Included by combo/select.mk



HOST_IS_64_BIT := true



HOST_GLOBAL_CFLAGS += -m64

HOST_GLOBAL_LDFLAGS += -m64

core/combo/HOST_linux-x86_64.mk

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
# Configuration for builds hosted on linux-x86_64.

# Included by combo/select.mk



HOST_IS_64_BIT := true



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

core/combo/HOST_windows-x86_64.mk

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
TOOLS_PREFIX := #prebuilt/windows/host/bin/

TOOLS_EXE_SUFFIX := .exe



HOST_IS_64_BIT := true



# Settings to use MinGW has a cross-compiler under Linux

ifneq ($(findstring Linux,$(UNAME)),)

ifneq ($(strip $(USE_MINGW)),)

core/combo/TARGET_linux-arm64.mk

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ else 
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)

endif



TARGET_IS_64_BIT := true



TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)

$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))

core/combo/TARGET_linux-mips64.mk

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ else 
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)

endif



TARGET_IS_64_BIT := true



TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)

$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT))