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/rbutilqt/Makefile.libs | |
| parent | 02c5dd364181ea40d2f9db01ab46a3733266513a (diff) | |
| download | rockbox-1e12990ba9.tar.gz rockbox-1e12990ba9.tar.bz2 rockbox-1e12990ba9.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/rbutilqt/Makefile.libs')
| -rw-r--r-- | rbutil/rbutilqt/Makefile.libs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs index ac4e31a9e4..f95fd52ab9 100644 --- a/rbutil/rbutilqt/Makefile.libs +++ b/rbutil/rbutilqt/Makefile.libs @@ -34,7 +34,7 @@ export CXX=$(EXTRALIBS_CXX) export AR=$(EXTRALIBS_AR) export ISYSROOT=$(EXTRALIB_ISYSROOT) -libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt +libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbspatch libbz2 librbtomcrypt # To support cross compiles, we explicitly pass the CC flag below for # all tools which override CC or CXX in their makefiles. CXX is only @@ -72,8 +72,8 @@ libmkimxboot: libmks5lboot: $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC) -libbzip2: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbzip2.a CC=$(CC) +libbz2: + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC) libbspatch: $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC) |