len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle TARGET_DIR in universal library building.

Browse source 
Building universal libraries needs to take TARGET_DIR into account as when set the individual libraries are placed into the build output folder and didn't got found anymore.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23778 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-11-28 22:39:00 +00:00
parent c3ca746de4
commit cca6f747f8
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rbutil/mkamsboot/Makefile
View file

@ -68,14 +68,14 @@ $(OUTPUT): $(OBJS) $(EXTRADEPS)
# some trickery to build ppc and i386 from a single call
ifeq ($(RBARCH),)
libmkamsbooti386.a:
$(TARGET_DIR)libmkamsbooti386.a:
make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmkamsbooti386.a
libmkamsbootppc.a:
$(TARGET_DIR)libmkamsbootppc.a:
make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmkamsbootppc.a
endif
libmkamsboot-universal: libmkamsbooti386.a libmkamsbootppc.a
libmkamsboot-universal: $(TARGET_DIR)libmkamsbooti386.a $(TARGET_DIR)libmkamsbootppc.a
@echo lipo $(TARGET_DIR)libmkamsboot.a
$(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a
lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a

6
rbutil/mktccboot/Makefile
View file

@ -72,14 +72,14 @@ $(OUTPUT): $(OBJS) $(EXTRADEPS)
# some trickery to build ppc and i386 from a single call
ifeq ($(RBARCH),)
libmktccbooti386.a:
$(TARGET_DIR)libmktccbooti386.a:
make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmktccbooti386.a
libmktccbootppc.a:
$(TARGET_DIR)libmktccbootppc.a:
make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmktccbootppc.a
endif
libmktccboot-universal: libmktccbooti386.a libmktccbootppc.a
libmktccboot-universal: $(TARGET_DIR)libmktccbooti386.a $(TARGET_DIR)libmktccbootppc.a
@echo lipo $(TARGET_DIR)libmktccboot.a
$(SILENT) rm -f $(TARGET_DIR)libmktccboot.a
lipo -create $(TARGET_DIR)libmktccbootppc.a $(TARGET_DIR)libmktccbooti386.a -output $(TARGET_DIR)libmktccboot.a

6
tools/ucl/src/Makefile
View file

@ -40,14 +40,14 @@ $(OUT)/%.o: %.c
# some trickery to build ppc and i386 from a single call
ifeq ($(RBARCH),)
libucli386.a:
$(TARGET_DIR)libucli386.a:
make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libucli386.a
libuclppc.a:
$(TARGET_DIR)libuclppc.a:
make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libuclppc.a
endif
libucl-universal: libucli386.a libuclppc.a
libucl-universal: $(TARGET_DIR)libucli386.a $(TARGET_DIR)libuclppc.a
@echo lipo $(TARGET_DIR)libucl.a
$(SILENT) rm -f $(TARGET_DIR)libucl.a
lipo -create $(TARGET_DIR)libuclppc.a $(TARGET_DIR)libucli386.a -output $(TARGET_DIR)libucl.a