diff --git a/configure.py b/configure.py
index 79293d1..b6285cf 100644
--- a/configure.py
+++ b/configure.py
@@ -848,7 +848,7 @@
 
     cuda_toolkit_paths_full = [os.path.join(cuda_toolkit_path, x) for x in cuda_rt_lib_paths]
     if any([os.path.exists(x) for x in cuda_toolkit_paths_full]):
-        break
+      break
 
     # Reset and retry
     print('Invalid path to CUDA %s toolkit. %s cannot be found' %
@@ -1399,6 +1399,13 @@
   write_to_bazelrc('build --define grpc_no_ares=true')
 
 
+def set_system_libs_flag(environ_cp):
+  syslibs = environ_cp.get('TF_SYSTEM_LIBS', '')
+  syslibs = ','.join(sorted(syslibs.split(',')))
+  if syslibs and syslibs != '':
+    write_action_env_to_bazelrc('TF_SYSTEM_LIBS', syslibs)
+
+
 def set_windows_build_flags(environ_cp):
   """Set Windows specific build options."""
   # The non-monolithic build is not supported yet
@@ -1555,6 +1562,7 @@
 
   set_grpc_build_flags()
   set_cc_opt_flags(environ_cp)
+  set_system_libs_flag(environ_cp)
   if is_windows():
     set_windows_build_flags(environ_cp)