diff options
| author |  Jason Furmanek <furmanek@us.ibm.com> | 2018-09-26 05:19:10 +0000 |
|---|---|---|
| committer | Jason Furmanek <furmanek@us.ibm.com> | 2018-09-26 05:19:10 +0000 |
| commit | d59678448469ca134875e062f7f8d6d77942af4e (patch) | |
| tree | e00120679932ef9cddb9360535d551ee32feaf8b /configure.py | |
| parent | 7c2341501a583ca625c976f118090e495cdcbe07 (diff) | |
fix unintential removal of set_system_libs_flag
Diffstat (limited to 'configure.py')
| -rw-r--r-- | configure.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 9fd2dc2630..3791ead3ed 100644 --- a/configure.py +++ b/configure.py @@ -1459,10 +1459,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.""" |