diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-11-28 22:39:05 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-11-28 22:39:05 +0000 |
commit | f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257 (patch) | |
tree | e3cff909d6264de689b0ba3235df3b9656773976 /tools | |
parent | cca6f747f807105fd7a8e4834ebd73a5a996d8d2 (diff) | |
download | rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.tar.gz rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.zip |
Fix building universal binaries.
When building various libraries for Rockbox Utility make sure they use the same compiler as Qt. Pass Qt's CC instead of explicitly setting it. This fixes issues linking on OS X (with recent XCode building universal binaries requires the use of gcc-4-0 while the default one is 4.2).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23779 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r-- | tools/rbspeex/Makefile | 4 | ||||
-rw-r--r-- | tools/ucl/src/Makefile | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 87ce08f3e7..6385c8a869 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile | |||
@@ -22,10 +22,6 @@ CFLAGS = $(SPEEXOPTS) $(INCLUDES) -O3 -fomit-frame-pointer -Wno-unused-parameter | |||
22 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) | 22 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) |
23 | CFLAGS+=-mno-cygwin | 23 | CFLAGS+=-mno-cygwin |
24 | endif | 24 | endif |
25 | # on mingw32, make sure CC is set to gcc | ||
26 | ifeq ($(findstring MINGW,$(shell uname)),MINGW) | ||
27 | CC = gcc | ||
28 | endif | ||
29 | 25 | ||
30 | ifdef RBARCH | 26 | ifdef RBARCH |
31 | CFLAGS += -arch $(RBARCH) | 27 | CFLAGS += -arch $(RBARCH) |
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile index 14ca1f35eb..018c29aa70 100644 --- a/tools/ucl/src/Makefile +++ b/tools/ucl/src/Makefile | |||
@@ -7,7 +7,6 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | CFLAGS = -I../include | 9 | CFLAGS = -I../include |
10 | CC = gcc | ||
11 | 10 | ||
12 | ifndef V | 11 | ifndef V |
13 | SILENT = @ | 12 | SILENT = @ |