From b28f29d5f5657b606921faf4c6dcc2ced1465cc7 Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Thu, 9 Nov 2017 17:05:07 +0000 Subject: COMPMID-652 - Graph examples shouldn't need to link against OpenCL - Added --no-allow-shlib-undefined to library builds to make sure we don't leave any unresolved symbol - Added --allow-shlib-undefined to the graph examples build lines so that it doesn't matter whether or not OpenCL is supported by the Graph librarylibrary - Don't link tests statically anymore on Android (This was probably required in the past because we were duplicating symbols in the core and runtime libraries, but it doesn't seem to be an issue anymore) - Updated Doxygen accordingly Change-Id: I9905f388e0838bc8e3369de52838bf980b992ead Reviewed-on: http://mpd-gerrit.cambridge.arm.com/95172 Tested-by: Kaizen Reviewed-by: Georgios Pinitas --- SConstruct | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index dffe4975b3..6f4835828a 100644 --- a/SConstruct +++ b/SConstruct @@ -85,6 +85,7 @@ env.Append(CXXFLAGS = ['-Wno-deprecated-declarations','-Wall','-DARCH_ARM', '-Winit-self','-Wstrict-overflow=2','-Wswitch-default', '-fpermissive','-std=gnu++11','-Wno-vla','-Woverloaded-virtual', '-Wctor-dtor-privacy','-Wsign-promo','-Weffc++','-Wno-format-nonliteral','-Wno-overlength-strings','-Wno-strict-overflow']) + env.Append(CPPDEFINES = ['_GLIBCXX_USE_NANOSLEEP']) if os.environ.get('CXX', 'g++') == 'clang++': @@ -185,7 +186,7 @@ if env['Werror']: if env['os'] == 'android': env.Append(CPPDEFINES = ['ANDROID']) - env.Append(LINKFLAGS = ['-pie', '-static-libstdc++']) + env.Append(LINKFLAGS = ['-pie']) elif env['os'] == 'bare_metal': env.Append(LINKFLAGS = ['-static']) env.Append(LINKFLAGS = ['-specs=rdimon.specs']) -- cgit v1.2.1