diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-01-02 17:45:16 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-01-02 17:45:16 +0000 |
| commit | 1f0e6530386e2295d9573f3f9cb7fd75f2e87450 (patch) | |
| tree | b6e88d5b54274d053b23b2a18d3e177fb1f55ba3 | |
| parent | d7b8b10fecbd352de4c5501a3ab064a818127146 (diff) | |
| download | rockbox-1f0e6530386e2295d9573f3f9cb7fd75f2e87450.zip rockbox-1f0e6530386e2295d9573f3f9cb7fd75f2e87450.tar.gz rockbox-1f0e6530386e2295d9573f3f9cb7fd75f2e87450.tar.bz2 rockbox-1f0e6530386e2295d9573f3f9cb7fd75f2e87450.tar.xz | |
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
| -rw-r--r-- | rbutil/chinachippatcher/Makefile | 1 | ||||
| -rw-r--r-- | rbutil/libtools.make | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rbutil/chinachippatcher/Makefile b/rbutil/chinachippatcher/Makefile index cdcca86..390260e 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 d25a971..4e66161 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 |