From 5fc39bd5d63e332e621d5bb8821c8a70ec9aee90 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Sun, 16 Sep 2018 01:38:55 +0800 Subject: 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 --- configure.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'configure.py') diff --git a/configure.py b/configure.py index e9d162fbd2..f0b9fada5e 100644 --- a/configure.py +++ b/configure.py @@ -1401,10 +1401,20 @@ def set_grpc_build_flags(): 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.""" -- cgit v1.2.3