From 9fb0cac961f70d1937c5fa3eafeaee1385c89768 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 20 Apr 2018 15:46:21 +0100 Subject: COMPMID-1081: Introduced test-wide instruments Change-Id: I5831241f3fc503717cc51136453c2bf96d4b420b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128484 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- SConstruct | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 626a302df6..23b9b2f7b4 100644 --- a/SConstruct +++ b/SConstruct @@ -196,8 +196,6 @@ if not GetOption("help"): if env['standalone']: env.Append(CXXFLAGS = ['-fPIC']) env.Append(LINKFLAGS = ['-static-libgcc','-static-libstdc++']) - if env['cppthreads']: - env.Append(LINKFLAGS = ['-lpthread']) if env['Werror']: env.Append(CXXFLAGS = ['-Werror']) @@ -222,6 +220,9 @@ if env['gles_compute']: print("Cannot link OpenGLES statically, which is required for bare metal / standalone builds") Exit(1) +if env["os"] not in ["android", "bare_metal"] and (env['opencl'] or env['cppthreads']): + env.Append(LIBS = ['pthread']) + if env['opencl'] or env['gles_compute']: if env['embed_kernels']: env.Append(CPPDEFINES = ['EMBEDDED_KERNELS']) -- cgit v1.2.1