diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-05 05:18:37 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-05 05:18:37 +0000 |
| commit | c1d5d110a1f5d910ee997ce1f08f635c8e7baba2 (patch) | |
| tree | 451aaddb3b4ef66fd66d693e3f2754be29850bb0 /libcxx/test | |
| parent | 2ced0edd1c1f21b5da38146def8a32363f5e50a1 (diff) | |
| download | bcm5719-llvm-c1d5d110a1f5d910ee997ce1f08f635c8e7baba2.tar.gz bcm5719-llvm-c1d5d110a1f5d910ee997ce1f08f635c8e7baba2.zip | |
Fix test suite configuration when no lit.site.cfg is available
llvm-svn: 291081
Diffstat (limited to 'libcxx/test')
| -rw-r--r-- | libcxx/test/libcxx/test/config.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py index b00f74fa7c3..40defdff51a 100644 --- a/libcxx/test/libcxx/test/config.py +++ b/libcxx/test/libcxx/test/config.py @@ -450,9 +450,11 @@ class Configuration(object): self.lit_config.fatal("cxx_headers='%s' is not a directory." % cxx_headers) self.cxx.compile_flags += ['-I' + cxx_headers] - cxxabi_headers = os.path.join(self.libcxx_obj_root, 'include', 'c++-build') - if os.path.isdir(cxxabi_headers): - self.cxx.compile_flags += ['-I' + cxxabi_headers] + if self.libcxx_obj_root is not None: + cxxabi_headers = os.path.join(self.libcxx_obj_root, 'include', + 'c++-build') + if os.path.isdir(cxxabi_headers): + self.cxx.compile_flags += ['-I' + cxxabi_headers] def configure_config_site_header(self): # Check for a possible __config_site in the build directory. We |
