Skip to content

Commit b462060

Browse files
authored
[build] Fixed zlib has no soname on arm-linux-gnueabi (koreader#575)
1 parent 38dbc22 commit b462060

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Makefile.third

+8-1
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,18 @@ $(GLIB_STATIC): $(LIBICONV) $(LIBGETTEXT) $(LIBFFI_DIR)/include $(THIRDPARTY_DIR
276276
$(ZLIB) $(ZLIB_STATIC): $(THIRDPARTY_DIR)/zlib/CMakeLists.txt
277277
install -d $(ZLIB_BUILD_DIR)
278278
-rm -f $(ZLIB_DIR)/../zlib-stamp/zlib-install $(ZLIB) $(ZLIB_STATIC)
279+
ifdef ANDROID
279280
cd $(ZLIB_BUILD_DIR) && \
280281
$(CMAKE) -DCC="$(CC)" -DCHOST="$(CHOST)" \
281-
-DLDFLAGS="$(LDFLAGS) $(if $(ANDROID),-shared $(ZLIB_LDFLAGS),) " \
282+
-DLDFLAGS="$(LDFLAGS) -shared $(ZLIB_LDFLAGS)" \
282283
$(CURDIR)/thirdparty/zlib && \
283284
$(MAKE)
285+
else
286+
cd $(ZLIB_BUILD_DIR) && \
287+
$(CMAKE) -DCC="$(CC)" \
288+
$(CURDIR)/thirdparty/zlib && \
289+
$(MAKE)
290+
endif
284291
ifdef WIN32
285292
cp -fL $(ZLIB_DIR)/$(notdir $(ZLIB)) $(ZLIB)
286293
else

0 commit comments

Comments
 (0)