From 665c89b264a86f4f27dd0a1259bea9c1372da396 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Mon, 16 Jul 2018 11:40:09 +0100 Subject: Revert "COMPMID-1246: Disable -pie and -static-libstdc++ when compiling with clang" This reverts commit 15e027e8b4fab55d8bf09e3bf3f589ecf9ef2fe8. Change-Id: I8423b4476b933ca026cd152b8160ad0684f6cb0a Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/140056 Reviewed-by: Pablo Tello Tested-by: Jenkins --- SConstruct | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index d386d978da..ccc92168e9 100644 --- a/SConstruct +++ b/SConstruct @@ -195,16 +195,14 @@ if not GetOption("help"): if env['standalone']: env.Append(CXXFLAGS = ['-fPIC']) - if 'clang++' not in cpp_compiler: - env.Append(LINKFLAGS = ['-static-libgcc','-static-libstdc++']) + env.Append(LINKFLAGS = ['-static-libgcc','-static-libstdc++']) if env['Werror']: env.Append(CXXFLAGS = ['-Werror']) if env['os'] == 'android': env.Append(CPPDEFINES = ['ANDROID']) - if 'clang++' not in cpp_compiler: - env.Append(LINKFLAGS = ['-pie', '-static-libstdc++']) + env.Append(LINKFLAGS = ['-pie', '-static-libstdc++']) elif env['os'] == 'bare_metal': env.Append(LINKFLAGS = ['-static']) env.Append(LINKFLAGS = ['-specs=rdimon.specs']) -- cgit v1.2.1