summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-03-05 12:50:46 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-03-05 12:50:46 +0000
commit8c6b8e6cd55dc3cf72ed696efab019ef627cad2f (patch)
treea0e27761d5005256836d8cabd8f5840a1cc7dd1e /lib
parent57bf8058e53af79f5d7f57f912df25d6b167e83a (diff)
downloadrockbox-8c6b8e6cd55dc3cf72ed696efab019ef627cad2f.tar.gz
rockbox-8c6b8e6cd55dc3cf72ed696efab019ef627cad2f.tar.bz2
rockbox-8c6b8e6cd55dc3cf72ed696efab019ef627cad2f.zip
Theme Editor: make cross compiling on OS X work.
The attempt to detect if building a fat library is necessary for libskin_parser makes cross compiling fail on OS X. Allow overriding the target platform for libskin_parser to fix that. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29515 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'lib')
-rw-r--r--lib/skin_parser/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/skin_parser/Makefile b/lib/skin_parser/Makefile
index fe417dbc58..5105b040fd 100644
--- a/lib/skin_parser/Makefile
+++ b/lib/skin_parser/Makefile
@@ -18,6 +18,7 @@ TARGET_DIR ?= ./
# construct build directory if BUILDDIR is not set.
BUILDDIR ?= $(TARGET_DIR)build
+TARGETPLATFORM ?= $(shell uname)
ifdef RBARCH
CFLAGS += -arch $(RBARCH)
@@ -37,7 +38,7 @@ $(OBJDIR)%.o: %.c
$(SILENT)mkdir -p $(dir $@)
$(SILENT)$(CC) $(CFLAGS) -c -o $@ $<
-ifeq ($(findstring Darwin,$(shell uname)),Darwin)
+ifeq ($(findstring Darwin,$(TARGETPLATFORM)),Darwin)
# some trickery to build ppc and i386 from a single call
$(OUTPUT).a: $(TARGET_DIR)$(OUTPUT)i386.a $(TARGET_DIR)$(OUTPUT)ppc.a
@echo lipo $(TARGET_DIR)$@