commit 5fc39bd5d63e332e621d5bb8821c8a70ec9aee90
author Jason Zaman <jason@perfinion.com> Sun Sep 16 01:38:55 2018 +0800
committer Jason Zaman <jason@perfinion.com> Sat Sep 22 10:31:27 2018 +0800
tree 08027bf9d3a50170e9f285fec9c6a59b9f1beaec
parent f8c1a3d9806d8c4adf2104be0b0ee395d548a6cb

configure.py: enhance systemlibs config

Allow TF_SYSTEM_LIBS env var to split on spaces or commas.
Write PREFIX and related variables to bazelrc as well.

Signed-off-by: Jason Zaman <jason@perfinion.com>

configure.py

diff --git a/configure.py b/configure.py
index e9d162f..f0b9fad 100644
--- a/configure.py
+++ b/configure.py
@@ -1401,10 +1401,20 @@
 
 def set_system_libs_flag(environ_cp):
   syslibs = environ_cp.get('TF_SYSTEM_LIBS', '')
-  syslibs = ','.join(sorted(syslibs.split(',')))
   if syslibs and syslibs != '':
+    if ',' in syslibs:
+      syslibs = ','.join(sorted(syslibs.split(',')))
+    else:
+      syslibs = ','.join(sorted(syslibs.split()))
     write_action_env_to_bazelrc('TF_SYSTEM_LIBS', syslibs)
 
+  if 'PREFIX' in environ_cp:
+    write_to_bazelrc('build --define=PREFIX=%s' % environ_cp['PREFIX'])
+  if 'LIBDIR' in environ_cp:
+    write_to_bazelrc('build --define=LIBDIR=%s' % environ_cp['LIBDIR'])
+  if 'INCLUDEDIR' in environ_cp:
+    write_to_bazelrc('build --define=INCLUDEDIR=%s' % environ_cp['INCLUDEDIR'])
+
 
 def set_windows_build_flags(environ_cp):
   """Set Windows specific build options."""