From 29c0377f07f4942f9957ea87d59c252148dc9e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Fri, 1 Jun 2018 15:13:30 +0200
Subject: WebAssembly for QtBase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is the squashed diff from wip/webassembly to dev.

Done-with: Peng Wu <peng.wu@intopalo.com>
Done-with: Sami Enne <sami.enne@intopalo.com>
Done-with: Morten Johan Sørvig <morten.sorvig@qt.io>
Started-by: Andrew Knight <andrew.knight@intopalo.com>
Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 configure.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 1f45f2ccb2..8c8118f39a 100644
--- a/configure.json
+++ b/configure.json
@@ -162,7 +162,8 @@
             "sources": [
                 { "libs": "-lzdll", "condition": "config.msvc" },
                 { "libs": "-lzlib", "condition": "config.msvc" },
-                { "libs": "-lz", "condition": "!config.msvc" }
+                { "libs": "-lz", "condition": "!config.msvc" },
+                { "libs": "-s USE_ZLIB=1", "condition": "config.wasm" }
             ]
         },
         "dbus": {
@@ -613,7 +614,7 @@
         },
         "use_gold_linker": {
             "label": "Using gold linker",
-            "condition": "!config.win32 && !config.integrity && tests.use_gold_linker",
+            "condition": "!config.win32 && !config.integrity && !config.wasm && tests.use_gold_linker",
             "output": [ "privateConfig", "useGoldLinker" ]
         },
         "optimize_debug": {
-- 
cgit v1.2.3