diff options
Diffstat (limited to '0018-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0018-Use-system-zlib-for-build-tools.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0018-Use-system-zlib-for-build-tools.patch b/0018-Use-system-zlib-for-build-tools.patch new file mode 100644 index 000000000000..cc0ff11346d3 --- /dev/null +++ b/0018-Use-system-zlib-for-build-tools.patch @@ -0,0 +1,27 @@ +From 312a89f94f25d46f925e0014e9e06eba43c37506 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:04:42 +0200 +Subject: [PATCH 18/33] Use system zlib for build tools + +--- + src/tools/bootstrap/bootstrap.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro +index 83e44ff9a4..4734623936 100644 +--- a/src/tools/bootstrap/bootstrap.pro ++++ b/src/tools/bootstrap/bootstrap.pro +@@ -135,7 +135,9 @@ macx { + ../../corelib/io/qstandardpaths_win.cpp + } + +-!qtConfig(system-zlib)|cross_compile { ++cross_compile { ++ LIBS += -lz ++} else:!qtConfig(system-zlib) { + include(../../3rdparty/zlib.pri) + } else { + CONFIG += no_core_dep +-- +2.22.0 + |