From 478ba5e3f00bb1321cd022d744020231f2449287 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 28 Jun 2012 16:02:19 -0700 Subject: [PATCH] Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk Bug: 6754632 So the warning won't show up when you run lunch. Now the warning only shows when you do a clean build. Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7 --- core/combo/HOST_darwin-x86.mk | 10 ---------- core/main.mk | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 8be6a42bac..cae37a7fd5 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -44,16 +44,6 @@ HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_ HOST_GLOBAL_CFLAGS += -fPIC 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_CXX := g++ HOST_AR := $(AR) diff --git a/core/main.mk b/core/main.mk index 3d8d6e07ef..3337a8a82f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -152,6 +152,18 @@ $(info ************************************************************) $(error stop) 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)' \ > $(OUT_DIR)/versions_checked.mk) endif