diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-11-28 22:39:00 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-11-28 22:39:00 +0000 |
| commit | cca6f747f807105fd7a8e4834ebd73a5a996d8d2 (patch) | |
| tree | 0a8936f678da78538b3a163ed11a778b8414d459 /rbutil/mktccboot | |
| parent | c3ca746de4ac62b3fba6f9b6656caf927a63c936 (diff) | |
| download | rockbox-cca6f747f807105fd7a8e4834ebd73a5a996d8d2.tar.gz rockbox-cca6f747f807105fd7a8e4834ebd73a5a996d8d2.zip | |
Handle TARGET_DIR in universal library building.
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
Diffstat (limited to 'rbutil/mktccboot')
| -rw-r--r-- | rbutil/mktccboot/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile index 4d6e857952..14c184321c 100644 --- a/rbutil/mktccboot/Makefile +++ b/rbutil/mktccboot/Makefile | |||
| @@ -72,14 +72,14 @@ $(OUTPUT): $(OBJS) $(EXTRADEPS) | |||
| 72 | 72 | ||
| 73 | # some trickery to build ppc and i386 from a single call | 73 | # some trickery to build ppc and i386 from a single call |
| 74 | ifeq ($(RBARCH),) | 74 | ifeq ($(RBARCH),) |
| 75 | libmktccbooti386.a: | 75 | $(TARGET_DIR)libmktccbooti386.a: |
| 76 | make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmktccbooti386.a | 76 | make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmktccbooti386.a |
| 77 | 77 | ||
| 78 | libmktccbootppc.a: | 78 | $(TARGET_DIR)libmktccbootppc.a: |
| 79 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmktccbootppc.a | 79 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmktccbootppc.a |
| 80 | endif | 80 | endif |
| 81 | 81 | ||
| 82 | libmktccboot-universal: libmktccbooti386.a libmktccbootppc.a | 82 | libmktccboot-universal: $(TARGET_DIR)libmktccbooti386.a $(TARGET_DIR)libmktccbootppc.a |
| 83 | @echo lipo $(TARGET_DIR)libmktccboot.a | 83 | @echo lipo $(TARGET_DIR)libmktccboot.a |
| 84 | $(SILENT) rm -f $(TARGET_DIR)libmktccboot.a | 84 | $(SILENT) rm -f $(TARGET_DIR)libmktccboot.a |
| 85 | lipo -create $(TARGET_DIR)libmktccbootppc.a $(TARGET_DIR)libmktccbooti386.a -output $(TARGET_DIR)libmktccboot.a | 85 | lipo -create $(TARGET_DIR)libmktccbootppc.a $(TARGET_DIR)libmktccbooti386.a -output $(TARGET_DIR)libmktccboot.a |