提交 9d772806 authored 作者: Frederic's avatar Frederic

Fix crash when cxx="" and g++ is present.

上级 650ad0d9
...@@ -120,8 +120,18 @@ enum = EnumStr("g++", "") ...@@ -120,8 +120,18 @@ enum = EnumStr("g++", "")
try: try:
rc = call_subprocess_Popen(['g++', '-v']) rc = call_subprocess_Popen(['g++', '-v'])
except OSError: except OSError:
enum = EnumStr("")
rc = 1 rc = 1
if rc == 0: AddConfigVar('cxx',
"The C++ compiler to use. Currently only g++ is"
" supported, but supporting additional compilers should not be "
"too difficult. "
"If it is empty, no C++ code is compiled.",
enum,
in_c_key=False)
del enum
if rc == 0 and config.cxx != "":
# Keep the default linker the same as the one for the mode FAST_RUN # Keep the default linker the same as the one for the mode FAST_RUN
AddConfigVar('linker', AddConfigVar('linker',
("Default linker used if the theano flags mode is Mode " ("Default linker used if the theano flags mode is Mode "
...@@ -140,16 +150,6 @@ else: ...@@ -140,16 +150,6 @@ else:
'optimized C-implementations (for both CPU and GPU) and will ' 'optimized C-implementations (for both CPU and GPU) and will '
'default to Python implementations. Performance will be severely ' 'default to Python implementations. Performance will be severely '
'degraded.') 'degraded.')
enum = EnumStr("")
AddConfigVar('cxx',
"The C++ compiler to use. Currently only g++ is"
" supported, but supporting additional compilers should not be "
"too difficult. "
"If it is empty, no C++ code is compiled.",
enum,
in_c_key=False)
del enum
#Keep the default value the same as the one for the mode FAST_RUN #Keep the default value the same as the one for the mode FAST_RUN
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论