From a12779561729eeef1075b9ef18cc5e74ca5e98ab Mon Sep 17 00:00:00 2001 From: Sterling Augustine Date: Thu, 5 Sep 2019 21:34:54 +0000 Subject: [PATCH] Don't assume libcxx_gdb is always set. libc++abi also uses this file, but doesn't use the same CMakeLists.txt. llvm-svn: 371130 --- libcxx/utils/libcxx/test/config.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 670063b..5cc16e1 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -490,9 +490,10 @@ class Configuration(object): self.config.available_features.add('glibc-%s' % maj_v) self.config.available_features.add('glibc-%s.%s' % (maj_v, min_v)) - if 'NOTFOUND' not in self.get_lit_conf('libcxx_gdb'): + libcxx_gdb = self.get_lit_conf('libcxx_gdb') + if libcxx_gdb and 'NOTFOUND' not in libcxx_gdb: self.config.available_features.add('libcxx_gdb') - self.cxx.libcxx_gdb = self.get_lit_conf('libcxx_gdb') + self.cxx.libcxx_gdb = libcxx_gdb # Support Objective-C++ only on MacOS and if the compiler supports it. if self.target_info.platform() == "darwin" and \ -- 2.7.4