diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2020-06-05 15:33:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 15:33:20 +0200 |
| commit | a8d71c6f344374184e90db2f3832345895f33c75 (patch) | |
| tree | 9a0803007c1c1ee1fb5769a985d6cb03027a0b9f /searchcore | |
| parent | 7eee203f34213f8958dde74a7d1ba01dc122efb1 (diff) | |
| parent | 60f3e303a325127f7c7eedf7abb447fb87d5ef28 (diff) | |
Merge pull request #13497 from vespa-engine/toregge/add-rhel-8-2-kludge
Add kludge to avoid unresolved symbols with gcc-toolset-9 on RHEL 8.2
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt index 7a9426ae716..7e1b1fb1e9a 100644 --- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt @@ -26,3 +26,7 @@ vespa_add_library(searchcore_pcommon STATIC searchcore_fconfig ${VESPA_STDCXX_FS_LIB} ) + +if(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 8.2") + set_source_files_properties(hw_info_sampler.cpp PROPERTIES COMPILE_FLAGS -DRHEL_8_2_KLUDGE) +endif() diff --git a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp index b381ee9122f..cdec0b440c4 100644 --- a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp @@ -157,3 +157,16 @@ HwInfoSampler::sampleDiskWriteSpeed(const vespalib::string &path, const Config & } } + +#ifdef RHEL_8_2_KLUDGE + +// Kludge to avoid unresolved symbols with gcc-toolset-9 on RHEL 8.2 +#include <codecvt> + +namespace std { + +template class codecvt_utf8<wchar_t>; + +} + +#endif |