len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cross compiling on OS X.

Browse source 
- 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
This commit is contained in:
Dominik Riebeling 2012-01-02 17:45:16 +00:00
parent d7b8b10fec
commit 1f0e653038
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rbutil/chinachippatcher/Makefile
View file

@ -7,7 +7,6 @@
# $Id$ # $Id$
# #
CFLAGS = -g -Wall CFLAGS = -g -Wall
CC = gcc
OUTPUT = chinachippatcher OUTPUT = chinachippatcher

2
rbutil/libtools.make
View file

@ -45,12 +45,14 @@ endif
NATIVECC = gcc NATIVECC = gcc
CC ?= gcc CC ?= gcc
ifeq ($(findstring Darwin,$(shell uname)),Darwin) 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) # building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode)
# might need adjustment for older Xcode. # might need adjustment for older Xcode.
CC ?= gcc-4.0 CC ?= gcc-4.0
CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
NATIVECC ?= gcc-4.0 NATIVECC ?= gcc-4.0
endif endif
endif
WINDRES = windres WINDRES = windres
BUILD_DIR ?= $(TARGET_DIR)build BUILD_DIR ?= $(TARGET_DIR)build