diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-10-21 22:17:11 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-10-22 19:20:48 +0200 |
| commit | 1e12990ba9a08589f9c0e770fdc22d539878a650 (patch) | |
| tree | 0daeb1f3af81eacf6a44eaf00de4b76f4056d6c2 /rbutil/bspatch | |
| parent | 02c5dd364181ea40d2f9db01ab46a3733266513a (diff) | |
| download | rockbox-1e12990ba9a08589f9c0e770fdc22d539878a650.tar.gz rockbox-1e12990ba9a08589f9c0e770fdc22d539878a650.zip | |
rbutil: Rename libbzip2.a to libbz2.a.
When cross compiling for Windows (at least mxe) links bz2, causing both
our copy and the system one getting linked, resulting in symbol clashes.
Make sure we use the same name as the system one, so the linker can pick
one of both.
Change-Id: I16213a20f48d4e192cd0b756931f9ccb449fd1c0
Diffstat (limited to 'rbutil/bspatch')
| -rw-r--r-- | rbutil/bspatch/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rbutil/bspatch/Makefile b/rbutil/bspatch/Makefile index 5fa2598bce..8f287a5ebb 100644 --- a/rbutil/bspatch/Makefile +++ b/rbutil/bspatch/Makefile | |||
| @@ -12,6 +12,6 @@ LIBSOURCES := bspatch.c | |||
| 12 | SOURCES := main.c | 12 | SOURCES := main.c |
| 13 | 13 | ||
| 14 | OUTPUT := bspatch | 14 | OUTPUT := bspatch |
| 15 | EXTRADEPS := libbzip2.a | 15 | EXTRADEPS := libbz2.a |
| 16 | 16 | ||
| 17 | include ../libtools.make | 17 | include ../libtools.make |