generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only use -target flag when target_triple is manually specified

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@226615 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-01-20 22:37:25 +00:00
parent e93e0347a6
commit b3289a0c88
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/libcxx/test/config.py
View File

@ -22,6 +22,7 @@ class Configuration(object):
self.obj_root = None
self.cxx_library_root = None
self.env = {}
self.use_target = False
self.use_system_cxx_lib = False
self.use_clang_verify = False
self.long_tests = None
@ -278,8 +279,8 @@ class Configuration(object):
gcc_toolchain = self.get_lit_conf('gcc_toolchain')
if gcc_toolchain:
self.cxx.flags += ['-gcc-toolchain', gcc_toolchain]
self.cxx.flags += ['-target', self.config.target_triple]
if self.use_target:
self.cxx.flags += ['-target', self.config.target_triple]
def configure_compile_flags_header_includes(self):
self.cxx.compile_flags += ['-I' + self.libcxx_src_root + '/test/support']
@ -444,9 +445,10 @@ class Configuration(object):
def configure_triple(self):
# Get or infer the target triple.
self.config.target_triple = self.get_lit_conf('target_triple')
self.use_target = bool(self.config.target_triple)
# If no target triple was given, try to infer it from the compiler
# under test.
if not self.config.target_triple:
if not self.use_target:
target_triple = self.cxx.getTriple()
# Drop sub-major version components from the triple, because the
# current XFAIL handling expects exact matches for feature checks.