diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2018-07-16 11:40:09 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
| commit | 665c89b264a86f4f27dd0a1259bea9c1372da396 (patch) | |
| tree | 5c55cb25d55bcd305daa8c008767659192a5b1f3 /SConstruct | |
| parent | 7b607dc5058d2f6a398cfac4d2eab65d415c3733 (diff) | |
| download | ComputeLibrary-665c89b264a86f4f27dd0a1259bea9c1372da396.tar.gz | |
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 <pablo.tello@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 2 insertions, 4 deletions
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']) |