From 1f0e6530386e2295d9573f3f9cb7fd75f2e87450 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 2 Jan 2012 17:45:16 +0000
Subject: Fix cross compiling on OS X.

- The OS X specific flags must not be set when cross compiling. Check for a
  MinGW compiler on OS X before adding them.
- Do not set CC explicitly in chinachippatcher, it will be set from Rockbox
  Utility's Makefile.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31527 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/chinachippatcher/Makefile | 1 -
 rbutil/libtools.make             | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rbutil/chinachippatcher/Makefile b/rbutil/chinachippatcher/Makefile
index cdcca865b0..390260ebfd 100644
--- a/rbutil/chinachippatcher/Makefile
+++ b/rbutil/chinachippatcher/Makefile
@@ -7,7 +7,6 @@
 # $Id$
 #
 CFLAGS = -g -Wall
-CC = gcc
 
 OUTPUT = chinachippatcher
 
diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index d25a97127c..4e66161011 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -45,12 +45,14 @@ endif
 NATIVECC = gcc
 CC ?= gcc
 ifeq ($(findstring Darwin,$(shell uname)),Darwin)
+ifneq ($(findstring mingw,$(CROSS)$(CC)),mingw)
 # building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode)
 # might need adjustment for older Xcode.
 CC ?= gcc-4.0
 CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
 NATIVECC ?= gcc-4.0
 endif
+endif
 WINDRES = windres
 
 BUILD_DIR ?= $(TARGET_DIR)build
-- 
cgit v1.2.3