summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-10 14:06:38 +0100
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-14 01:34:25 +0100
commitbd3c27ba7862d50b1bf54733e9f890f7084a9ea5 (patch)
tree0ccca56f5fbc3fde1bc00ee72e272b842329c62f /platform
parent9e2b1b3b009f26fc24bbf02b4b66218f00133907 (diff)
Allow building with system wide mbedtls on X11
Using builtin_mbedtls=yes is still the default as many distributions do not ship with mbedtls included.
Diffstat (limited to 'platform')
-rw-r--r--platform/x11/detect.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 72265c84ad..c5ef82150b 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -152,6 +152,10 @@ def configure(env):
# FIXME: Check for existence of the libs before parsing their flags with pkg-config
+ if not env['builtin_mbedtls']:
+ # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
+ env.Append(LIBS=['mbedtls', 'mbedcrypto', 'mbedx509'])
+
if not env['builtin_libwebp']:
env.ParseConfig('pkg-config libwebp --cflags --libs')