提交 ae8f39dc authored 作者: Pascal Lamblin's avatar Pascal Lamblin

Remove code detecting llvm.

Instead of detecting llvm, we try to use -march=native, which is more general.
上级 b8e95e20
...@@ -1472,33 +1472,6 @@ def gcc_version(): ...@@ -1472,33 +1472,6 @@ def gcc_version():
return gcc_version_str return gcc_version_str
def gcc_llvm():
""" Detect if the g++ version used is the llvm one or not.
It does not support all g++ parameters even if it supports many of them.
"""
if gcc_llvm.is_llvm is None:
p = None
try:
p = call_subprocess_Popen(['g++', '--version'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
p.wait()
output = p.stdout.read() + p.stderr.read()
except OSError:
# Typically means g++ cannot be found.
# So it is not an llvm compiler.
# Normally this should not happen as we should not try to
# compile when g++ is not available. If this happens, it
# will crash later so supposing it is not llvm is "safe".
output = ''
del p
gcc_llvm.is_llvm = "llvm" in output
return gcc_llvm.is_llvm
gcc_llvm.is_llvm = None
class GCC_compiler(object): class GCC_compiler(object):
# The equivalent flags of --march=native used by g++. # The equivalent flags of --march=native used by g++.
march_flags = None march_flags = None
...@@ -1520,10 +1493,6 @@ class GCC_compiler(object): ...@@ -1520,10 +1493,6 @@ class GCC_compiler(object):
# http://en.gentoo-wiki.com/wiki/Safe_Cflags#-march.3Dnative # http://en.gentoo-wiki.com/wiki/Safe_Cflags#-march.3Dnative
# http://en.gentoo-wiki.com/wiki/Hardware_CFLAGS # http://en.gentoo-wiki.com/wiki/Hardware_CFLAGS
detect_march = GCC_compiler.march_flags is None detect_march = GCC_compiler.march_flags is None
if detect_march and gcc_llvm():
detect_march = False
GCC_compiler.march_flags = []
if detect_march: if detect_march:
for f in cxxflags: for f in cxxflags:
#If the user give an -march=X parameter, don't add one ourself #If the user give an -march=X parameter, don't add one ourself
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论