mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-10 12:41:14 +00:00
753236ea22
zlib refuses to run configure with mingw32 host and insists that win32/Makefile.gcc is used instead. This requires a change in this Makefile to support static-only builds. Fixes #694. Signed-off-by: Alexey Neyman <stilor@att.net>
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
diff -urpN zlib-1.2.11.orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
|
|
--- zlib-1.2.11.orig/win32/Makefile.gcc 2017-05-23 18:52:07.937730080 -0700
|
|
+++ zlib-1.2.11/win32/Makefile.gcc 2017-05-23 19:02:24.068666463 -0700
|
|
@@ -71,7 +71,11 @@ OBJS = adler32.o compress.o crc32.o defl
|
|
gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
|
|
OBJA =
|
|
|
|
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
|
|
+all: $(STATICLIB) example.exe minigzip.exe
|
|
+
|
|
+ifeq ($(SHARED_MODE),1)
|
|
+all: $(SHAREDLIB) $(IMPLIB) example_d.exe minigzip_d.exe
|
|
+endif
|
|
|
|
test: example.exe minigzip.exe
|
|
./example
|
|
@@ -125,7 +129,7 @@ zlibrc.o: win32/zlib1.rc
|
|
.PHONY: install uninstall clean
|
|
|
|
install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
|
|
- @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
|
|
+ @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \
|
|
echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
|
|
exit 1; \
|
|
fi
|