From ded02d82e7bb8e1ff18b1bbe29c40cb9f885d26e Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 6 Jan 2012 09:24:38 +0000
Subject: Remove OS X special universal binary handling.

Since the libs are now build as universal libs there is no need anymore to
create separate binaries for both architectures and run lipo on them, just
build in a single run now. Fixes building universal binaries and dmg for all
tools using libtools.make.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31590 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/libtools.make | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'rbutil/libtools.make')

diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index 0d028e09be..b3015015ed 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -121,20 +121,8 @@ clean:
 	rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR)
 
 # OS X specifics
-$(OUTPUT)-i386:
-	$(MAKE) RBARCH=i386
-	mv $(OUTPUT) $@
-
-$(OUTPUT)-ppc:
-	$(MAKE) RBARCH=ppc
-	mv $(OUTPUT) $@
-
-$(OUTPUT)-mac: $(OUTPUT)-i386 $(OUTPUT)-ppc
-	@echo LIPO $@
-	$(SILENT)lipo -create $(OUTPUT)-ppc $(OUTPUT)-i386 -output $@
-
-$(OUTPUT).dmg: $(OUTPUT)-mac
+$(OUTPUT).dmg: $(OUTPUT)
 	@echo DMG $@
 	$(SILENT)mkdir -p $(OUTPUT)-dmg
-	$(SILENT)cp -p $(OUTPUT)-mac $(OUTPUT)-dmg
+	$(SILENT)cp -p $(OUTPUT) $(OUTPUT)-dmg
 	$(SILENT)hdiutil create -srcfolder $(OUTPUT)-dmg $@
-- 
cgit