StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
This commit is contained in:
Ying Wang
2012-06-29 20:19:50 -07:00
committed by Android Git Automerger
parent 5081af57d3 e42ed0ba15
commit d512fda4ae
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/combo/HOST_darwin-x86.mk
View File

@@ -50,16 +50,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
core/main.mk
View File

@@ -157,6 +157,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