diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-12-14 18:19:14 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-12-14 18:19:14 +0000 |
| commit | bc297b1da9d63bd2ee64dd0f57cb41e66c2a50a9 (patch) | |
| tree | 870170a548824cd605e46ea3756ab9891d8550f7 /libcxx | |
| parent | 5948b7f30fc4ac9c2ddc142ffb4341bd9eb2289b (diff) | |
| download | bcm5719-llvm-bc297b1da9d63bd2ee64dd0f57cb41e66c2a50a9.tar.gz bcm5719-llvm-bc297b1da9d63bd2ee64dd0f57cb41e66c2a50a9.zip | |
[libcxx] Make sure use_system_cxx_lib does not override cxx_runtime_root for DYLD_LIBRARY_PATH
Otherwise, even specifying a runtime root different from the library
we're linking against won't work -- the library we're linking against
is always used. This is undesirable if we try testing something like
linking against a recent libc++.dylib but running the tests against an
older version (the back-deployment use case).
llvm-svn: 349171
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/docs/TestingLibcxx.rst | 3 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/target_info.py | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libcxx/docs/TestingLibcxx.rst b/libcxx/docs/TestingLibcxx.rst index 48b7271c321..ebbbf628ac0 100644 --- a/libcxx/docs/TestingLibcxx.rst +++ b/libcxx/docs/TestingLibcxx.rst @@ -138,8 +138,7 @@ configuration. Passing the option on the command line will override the default. Specify the directory of the libc++ library to use at runtime. This directory is not added to the linkers search path. This can be used to compile tests against one version of libc++ and run them using another. The default value - for this option is `cxx_library_root`. This option cannot be used - when use_system_cxx_lib is provided. + for this option is `cxx_library_root`. .. option:: use_system_cxx_lib=<bool> diff --git a/libcxx/utils/libcxx/test/target_info.py b/libcxx/utils/libcxx/test/target_info.py index 2ca09dc5da9..3181d4bd313 100644 --- a/libcxx/utils/libcxx/test/target_info.py +++ b/libcxx/utils/libcxx/test/target_info.py @@ -144,12 +144,12 @@ class DarwinLocalTI(DefaultTargetInfo): def configure_env(self, env): library_paths = [] # Configure the library path for libc++ - if self.full_config.use_system_cxx_lib: + if self.full_config.cxx_runtime_root: + library_paths += [self.full_config.cxx_runtime_root] + elif self.full_config.use_system_cxx_lib: if (os.path.isdir(str(self.full_config.use_system_cxx_lib))): library_paths += [self.full_config.use_system_cxx_lib] - pass - elif self.full_config.cxx_runtime_root: - library_paths += [self.full_config.cxx_runtime_root] + # Configure the abi library path if self.full_config.abi_library_root: library_paths += [self.full_config.abi_library_root] |
