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

Commit e42ed0ba authored by Ying Wang's avatar Ying Wang Committed by android code review
Browse files

Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"

parents 6e587f53 478ba5e3
Loading
Loading
Loading
Loading
+0 −10
Original line number Original line Diff line number Diff line
@@ -44,16 +44,6 @@ HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_
HOST_GLOBAL_CFLAGS += -fPIC
HOST_GLOBAL_CFLAGS += -fPIC
HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error
HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error


GCC_REALPATH = $(realpath $(shell which gcc))
ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),)
    # Using LLVM GCC results in a non functional emulator due to it
    # not honouring global register variables
    $(warning ****************************************)
    $(warning * gcc is linked to llvm-gcc which will *)
    $(warning * not create a useable emulator.       *)
    $(warning ****************************************)
endif

HOST_CC := gcc
HOST_CC := gcc
HOST_CXX := g++
HOST_CXX := g++
HOST_AR := $(AR)
HOST_AR := $(AR)
+12 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,18 @@ $(info ************************************************************)
$(error stop)
$(error stop)
endif
endif


ifeq (darwin,$(HOST_OS))
GCC_REALPATH = $(realpath $(shell which gcc))
ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),)
  # Using LLVM GCC results in a non functional emulator due to it
  # not honouring global register variables
  $(warning ****************************************)
  $(warning * gcc is linked to llvm-gcc which will *)
  $(warning * not create a useable emulator.       *)
  $(warning ****************************************)
endif
endif

$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
        > $(OUT_DIR)/versions_checked.mk)
        > $(OUT_DIR)/versions_checked.mk)
endif
endif