summaryrefslogtreecommitdiffstats
path: root/rbutil/libtools.make
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-02 17:45:16 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-02 17:45:16 +0000
commit1f0e6530386e2295d9573f3f9cb7fd75f2e87450 (patch)
treeb6e88d5b54274d053b23b2a18d3e177fb1f55ba3 /rbutil/libtools.make
parentd7b8b10fecbd352de4c5501a3ab064a818127146 (diff)
downloadrockbox-1f0e6530386e2295d9573f3f9cb7fd75f2e87450.tar.gz
rockbox-1f0e6530386e2295d9573f3f9cb7fd75f2e87450.zip
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
Diffstat (limited to 'rbutil/libtools.make')
-rw-r--r--rbutil/libtools.make2
1 files changed, 2 insertions, 0 deletions
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