diff --git a/platform/server/detect.py b/platform/server/detect.py
index c7a96de2340..f550cca22a1 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -22,6 +22,7 @@ def get_opts():
     from SCons.Variables import BoolVariable
     return [
         BoolVariable('use_llvm', 'Use the LLVM compiler', False),
+        BoolVariable('use_static_cpp', 'Link libgcc and libstdc++ statically for better portability', False),
     ]
 
 
@@ -135,3 +136,7 @@ def configure(env):
     env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED'])
     env.Append(LIBS=['pthread'])
     env.Append(LIBS=['dl'])
+
+    # Link those statically for portability
+    if env['use_static_cpp']:
+        env.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++'])