summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-11-28 22:39:05 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-11-28 22:39:05 +0000
commitf0d0ba86ff32ba8f4cffebcc9d6984e7000e8257 (patch)
treee3cff909d6264de689b0ba3235df3b9656773976 /tools
parentcca6f747f807105fd7a8e4834ebd73a5a996d8d2 (diff)
downloadrockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.zip
rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.tar.gz
rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.tar.bz2
rockbox-f0d0ba86ff32ba8f4cffebcc9d6984e7000e8257.tar.xz
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/Makefile4
-rw-r--r--tools/ucl/src/Makefile1
2 files changed, 0 insertions, 5 deletions
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 87ce08f..6385c8a 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -22,10 +22,6 @@ CFLAGS = $(SPEEXOPTS) $(INCLUDES) -O3 -fomit-frame-pointer -Wno-unused-parameter
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
CFLAGS+=-mno-cygwin
endif
-# on mingw32, make sure CC is set to gcc
-ifeq ($(findstring MINGW,$(shell uname)),MINGW)
-CC = gcc
-endif
ifdef RBARCH
CFLAGS += -arch $(RBARCH)
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile
index 14ca1f3..018c29a 100644
--- a/tools/ucl/src/Makefile
+++ b/tools/ucl/src/Makefile
@@ -7,7 +7,6 @@
# $Id$
#
CFLAGS = -I../include
-CC = gcc
ifndef V
SILENT = @