diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-02 09:40:13 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-02 09:40:13 -0700 |
| commit | f562adc85f05b17c2c10993f3da07e61a7a24b74 (patch) | |
| tree | 6046c26da3b37ff4a58d3ac46bda2ff51ed4f10d | |
| parent | 2ba46ecdc4bca804ffedc38694910dc1322b42d1 (diff) | |
| parent | 0d07c732c79ec5d624dea2fa0198ffc2dfeafe2b (diff) | |
| download | build-f562adc85f05b17c2c10993f3da07e61a7a24b74.zip build-f562adc85f05b17c2c10993f3da07e61a7a24b74.tar.gz build-f562adc85f05b17c2c10993f3da07e61a7a24b74.tar.bz2 | |
Merge "Force use of compatibility compilers on Apple's command line tools"
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 54a64a3..2a120d9 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -42,8 +42,18 @@ endif # build_mac_version is 10.6 HOST_GLOBAL_CFLAGS += -fPIC HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error -HOST_CC := $(CC) -HOST_CXX := $(CXX) +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) HOST_STRIP := $(STRIP) HOST_STRIP_COMMAND = $(HOST_STRIP) --strip-debug $< -o $@ |