summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2019-02-06 18:06:50 +0000
committerLouis Dionne <ldionne@apple.com>2019-02-06 18:06:50 +0000
commit6f6beae627b2c97b8c355473304f82bd4576364a (patch)
treed1d43833f906fbe36839eac69cb38247035591fc
parente0a89091d66356f851fed4cafbaf0068ca9ef91c (diff)
downloadbcm5719-llvm-6f6beae627b2c97b8c355473304f82bd4576364a.tar.gz
bcm5719-llvm-6f6beae627b2c97b8c355473304f82bd4576364a.zip
[libc++] Only add dylib-related features when using the system's libc++
Otherwise, when testing trunk libc++ on an older system, lit will think that the dylib features are disabled. Ideally, we'd have a notion of running the tests with/without a deployment target (or, equivalently, a deployment target representing trunk where everything is as recent as can be). Since we always have a deployment target right now (which defaults to the current system), we only enable those features when we're going to also be testing with the system libc++. llvm-svn: 353319
-rw-r--r--libcxx/utils/libcxx/test/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 5c7f4c3670a..f086e6630b1 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -1145,7 +1145,7 @@ class Configuration(object):
# Throwing bad_optional_access, bad_variant_access and bad_any_cast is
# supported starting in macosx10.14.
- if name == 'macosx' and version in ('10.%s' % v for v in range(7, 14)):
+ if self.get_lit_conf('use_system_cxx_lib') and name == 'macosx' and version in ('10.%s' % v for v in range(7, 14)):
self.config.available_features.add('dylib-has-no-bad_optional_access')
self.lit_config.note("throwing bad_optional_access is not supported by the deployment target")
OpenPOWER on IntegriCloud