commit 9fb0cac961f70d1937c5fa3eafeaee1385c89768
author Anthony Barbier <anthony.barbier@arm.com> Fri Apr 20 15:46:21 2018 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:49:54 2018 +0000
tree 9a8847053f65631e050c231645549adb48c92fb8
parent fda901f0485371e8b6a807c8dd9614560a924793

COMPMID-1081: Introduced test-wide instruments

Change-Id: I5831241f3fc503717cc51136453c2bf96d4b420b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128484
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

SConstruct

diff --git a/SConstruct b/SConstruct
index 626a302..23b9b2f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -196,8 +196,6 @@
 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 @@
         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'])