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 /tools/ucl | |
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 'tools/ucl')
-rw-r--r-- | tools/ucl/src/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile index 147959aaa1..14ca1f35eb 100644 --- a/tools/ucl/src/Makefile +++ b/tools/ucl/src/Makefile | |||
@@ -40,14 +40,14 @@ $(OUT)/%.o: %.c | |||
40 | 40 | ||
41 | # some trickery to build ppc and i386 from a single call | 41 | # some trickery to build ppc and i386 from a single call |
42 | ifeq ($(RBARCH),) | 42 | ifeq ($(RBARCH),) |
43 | libucli386.a: | 43 | $(TARGET_DIR)libucli386.a: |
44 | make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libucli386.a | 44 | make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libucli386.a |
45 | 45 | ||
46 | libuclppc.a: | 46 | $(TARGET_DIR)libuclppc.a: |
47 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libuclppc.a | 47 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libuclppc.a |
48 | endif | 48 | endif |
49 | 49 | ||
50 | libucl-universal: libucli386.a libuclppc.a | 50 | libucl-universal: $(TARGET_DIR)libucli386.a $(TARGET_DIR)libuclppc.a |
51 | @echo lipo $(TARGET_DIR)libucl.a | 51 | @echo lipo $(TARGET_DIR)libucl.a |
52 | $(SILENT) rm -f $(TARGET_DIR)libucl.a | 52 | $(SILENT) rm -f $(TARGET_DIR)libucl.a |
53 | lipo -create $(TARGET_DIR)libuclppc.a $(TARGET_DIR)libucli386.a -output $(TARGET_DIR)libucl.a | 53 | lipo -create $(TARGET_DIR)libuclppc.a $(TARGET_DIR)libucli386.a -output $(TARGET_DIR)libucl.a |