Let go properly link binries in PIC mode

81668e85a416903e82cfa2a2223680f04a3343c7

1 files changed, 7 insertions, 2 deletions

diff --git a/build/scripts/go_tool.py b/build/scripts/go_tool.py
index 0d1dd78b2b..f11b3b82df 100644
--- a/build/scripts/go_tool.py
+++ b/build/scripts/go_tool.py
@@ -497,9 +497,14 @@ def do_link_exe(args):
     if args.buildmode:
         cmd.append('-buildmode={}'.format(args.buildmode))
     elif args.mode in ('exe', 'test'):
-        cmd.append('-buildmode=exe')
+        mode = '-buildmode=exe'
         if 'ld.lld' in str(args):
-            extldflags.append('-Wl,-no-pie')
+            if '-fPIE' in str(args) or '-fPIC' in str(args):
+                # support explicit PIE
+                mode = '-buildmode=pie'
+            else:
+                extldflags.append('-Wl,-no-pie')
+        cmd.append(mode)
     elif args.mode == 'dll':
         cmd.append('-buildmode=c-shared')
     else: