diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-22 16:39:24 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-22 16:39:24 +0000 |
| commit | 833b8f68babcd2cee9c7739e4e9e8136ac33a42a (patch) | |
| tree | f177d619af8f985517759c52432b4643f9d2ad43 | |
| parent | d2482584d72847155f87c60f4d891f7f0df3c87d (diff) | |
Merging r340406:
------------------------------------------------------------------------
r340406 | ericwf | 2018-08-22 15:29:52 +0200 (Wed, 22 Aug 2018) | 12 lines
Attempt to unbreak filesystem tests on certain linux distros.
On some platforms clock_gettime is in librt, which we don't
link by default when building the tests. However it is required
by the filesystem tests.
This patch introduces a workaround which links librt whenever
the filesystem tests are enabled. The workaround should later
be replaced with a patch that selectively links both libc++fs
and librt only when building filesystem specific tests. However,
the way the test configuration is set up right now, this is
non-trivial.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/branches/release_70@340419 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | utils/libcxx/test/target_info.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/libcxx/test/target_info.py b/utils/libcxx/test/target_info.py index 0e93e1144..de2232ff4 100644 --- a/utils/libcxx/test/target_info.py +++ b/utils/libcxx/test/target_info.py @@ -222,12 +222,17 @@ class LinuxLocalTI(DefaultTargetInfo): self.full_config.config.available_features) llvm_unwinder = self.full_config.get_lit_bool('llvm_unwinder', False) shared_libcxx = self.full_config.get_lit_bool('enable_shared', True) + # FIXME: Remove the need to link -lrt in all the tests, and instead + # limit it only to the filesystem tests. This ensures we don't cause an + # implicit dependency on librt except when filesystem is needed. + enable_fs = self.full_config.get_lit_bool('enable_filesystem', + default=False) flags += ['-lm'] if not llvm_unwinder: flags += ['-lgcc_s', '-lgcc'] if enable_threads: flags += ['-lpthread'] - if not shared_libcxx: + if not shared_libcxx or enable_fs: flags += ['-lrt'] flags += ['-lc'] if llvm_unwinder: |