diff options
Diffstat (limited to '0017-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0017-Use-system-zlib-for-build-tools.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch new file mode 100644 index 000000000000..3e8814e569ca --- /dev/null +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -0,0 +1,27 @@ +From c8b4c96da58bf20d982f5142ac0f218a2abeeb90 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:04:42 +0200 +Subject: [PATCH 17/32] 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 24862a07dbc..698e6cfb95d 100644 +--- a/src/tools/bootstrap/bootstrap.pro ++++ b/src/tools/bootstrap/bootstrap.pro +@@ -158,7 +158,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.44.0 + |