diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-28 21:13:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 21:13:58 +0100 |
| commit | c6dff58f491c30ffc2a81a8d69da86ff8105053f (patch) | |
| tree | 70a1ec6616f76adbdbed37a84ca7d8bdde602654 /modules/websocket/SCsub | |
| parent | 3d03bcd0636aacfe530c52fc1cdc32c2edffea04 (diff) | |
| parent | 659c62ee338975eddf1f7e65f68190af65199324 (diff) | |
Merge pull request #17115 from Faless/lws_bsd_malloc
Fix mbedTLS and Websocket on FreeBSD
Diffstat (limited to 'modules/websocket/SCsub')
| -rw-r--r-- | modules/websocket/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index 1a36e05863..8bb83436d9 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -69,11 +69,11 @@ else: env_lws.Append(CPPPATH=[thirdparty_dir]) wrapper_includes = ["#thirdparty/lws/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]] - env_lws.Append(CPPPATH=wrapper_includes) + env_lws.Prepend(CPPPATH=wrapper_includes) if env['builtin_mbedtls']: mbedtls_includes = "#thirdparty/mbedtls/include" - env_lws.Append(CPPPATH=[mbedtls_includes]) + env_lws.Prepend(CPPPATH=[mbedtls_includes]) if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir]) |